From f22f4d21298241df7af3457c8cdb9c561185fcfa Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Tue, 14 May 2019 11:28:55 -0700 Subject: [PATCH 01/25] rails app created, zomg route initiated but no action taken yet --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 6 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 938 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..d43d20b6e --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.6 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..04774248b --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +H/GEnQt0SZ9TjjfyObfDYqdDY7osFRUsbnWpm7jMDM7rkAV/keuvi0C5l+lzDt0/hon+qK4rXcYEfHDF/5kDhtes46upnkGUm+wBNZRwj7mxgrvyiXBX1Acq/DWXiy/E6FiABDAHE4T8Co8lwk353MwyvjzpQ7Qjo6ChuxYT39vfPjtHCLqRII+ipPjxNM9gxY1KdYgf3l5my49xIvXnQvVGbQpsjtjs2TprId+b0rVo3sblzoMGdOUaH7Hxd5B9PBnBZir8aktc5ZiSzlgZqM6FGKcE67gVMDQmKUoBPl3qYaTBHli/0Eh9lpKhNuxQXOPp8yMvTb/d0fEXgSGbk8ewAeh/BSZRDIhctXtzNRvFAr02Zp/qJ5m++8BHvib06VRnSvHVhKPDl76DSlCh44T9ZRaU8T91vEyg--Ncx2EHC28DzGYIri--lqOB/N+2b0kqBNL17/53kQ== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..4831f86af --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,6 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +get "/zomg" +end + + diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From b2e58e5513cf674b79676047be40defe1d50e307 Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Tue, 14 May 2019 12:53:38 -0700 Subject: [PATCH 02/25] model and controllers created for movie and customer, routes updated --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ app/models/customer.rb | 9 +++++++++ app/models/movie.rb | 7 +++++++ config/routes.rb | 10 +++++++++- db/migrate/20190514195117_create_customers.rb | 15 +++++++++++++++ db/migrate/20190514195149_create_movies.rb | 12 ++++++++++++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/models/customer_test.rb | 9 +++++++++ test/models/movie_test.rb | 9 +++++++++ 13 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20190514195117_create_customers.rb create mode 100644 db/migrate/20190514195149_create_movies.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..9c0035179 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,9 @@ +class Customer < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..c80dafc7e --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,7 @@ +class Movie < ApplicationRecord + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true + validates :inventory, numericality: true +end diff --git a/config/routes.rb b/config/routes.rb index 4831f86af..ea93a175e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,14 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html -get "/zomg" + + resources :customers, only: [:index, :show, :create] + resources :movies, only: [:index, :show, :create] + +# GET "/zomg", + +# GET /movies show all movies +# GET /movies/:id shows a movie with the provided id +# POST /movies add a movie to the collection end diff --git a/db/migrate/20190514195117_create_customers.rb b/db/migrate/20190514195117_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514195117_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + 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/migrate/20190514195149_create_movies.rb b/db/migrate/20190514195149_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514195149_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..25c513098 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2019-05-14 12:51:17 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 12:51:17 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e8afe187d --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From 1a0a233629127b82a8ac1b2ab6d8916944376385 Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Tue, 14 May 2019 13:00:26 -0700 Subject: [PATCH 03/25] validations ammended --- app/models/customer.rb | 5 ----- app/models/movie.rb | 2 -- 2 files changed, 7 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 9c0035179..c0291de51 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,9 +1,4 @@ class Customer < ApplicationRecord validates :name, presence: true - validates :registered_at, presence: true - validates :address, presence: true - validates :city, presence: true - validates :state, presence: true - validates :postal_code, presence: true validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index c80dafc7e..0844e541a 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,5 @@ class Movie < ApplicationRecord validates :title, presence: true - validates :overview, presence: true - validates :release_date, presence: true validates :inventory, presence: true validates :inventory, numericality: true end From 2cc94db96dee56d20aeebb052b76d0247ff633a1 Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Tue, 14 May 2019 13:20:50 -0700 Subject: [PATCH 04/25] customer model validation tests written and passed --- db/schema.rb | 39 ++++++++++++++++++++++++++++++++++++ test/fixtures/customers.yml | 14 ++++++------- test/models/customer_test.rb | 16 ++++++++++++--- test/test_helper.rb | 3 ++- 4 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..f3cd12190 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# 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: 2019_05_14_195149) 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.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 25c513098..200c9d82d 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +donald: + name: Customer Donald registered_at: 2019-05-14 12:51:17 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 123 Sesame St + city: Wonderworld + state: Idaho + postal_code: "12345" + phone: "0987654321" two: name: MyString diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..bb267fb98 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,19 @@ require "test_helper" +require 'pry' describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:donald) } - it "must be valid" do - value(customer).must_be :valid? + it "can be created" do + expect(customer.valid?).must_equal true + end + + it "requires name and phone number" do + required_fields = [:name, :phone] + required_fields.each do |field| + customer[field] = nil + expect(customer.valid?).must_equal false + customer.reload + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 98ba32565d1be3ba39c2377217c9045fa227d4e5 Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Tue, 14 May 2019 13:22:04 -0700 Subject: [PATCH 05/25] movie model testing --- db/schema.rb | 39 +++++++++++++++++++++++++++++++++++++++ test/fixtures/movies.yml | 12 ++++++------ test/models/movie_test.rb | 20 +++++++++++++++++++- test/test_helper.rb | 3 ++- 4 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..f3cd12190 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# 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: 2019_05_14_195149) 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.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e8afe187d..24b14ea4d 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - overview: MyString + title: Pan's Labyrinth + overview: Find freedom in a magial world of mnythical beings. release_date: 2019-05-14 - inventory: 1 + inventory: 5 two: - title: MyString - overview: MyString + title: Get Out + overview: Run! release_date: 2019-05-14 - inventory: 1 + inventory: 6 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..8fb57331b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,27 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:one) } it "must be valid" do value(movie).must_be :valid? end + + it "requires title, and inventory" do + required_fields = [:title, :inventory] + + required_fields.each do |field| + movie[field] = nil + + expect(movie.valid?).must_equal false + + movie.reload + end + end + + it "requires a numeric inventory" do + movie.inventory = "five" + + expect(movie.valid?).must_equal false + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 971bf23e7dd74f16d96f0be9b77d813a02d66ca5 Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Tue, 14 May 2019 13:50:10 -0700 Subject: [PATCH 06/25] zomg works! also added customer controller tests --- app/controllers/customers_controller.rb | 4 ++ app/models/customer.rb | 3 ++ config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 44 +++++++++++++++++-- test/fixtures/customers.yml | 12 ++--- test/models/customer_test.rb | 8 +++- 6 files changed, 62 insertions(+), 11 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..ad918521b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,6 @@ class CustomersController < ApplicationController + def zomg + render json: { message: "it works!"}, + status: :ok + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index c0291de51..c84aa348a 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,7 @@ class Customer < ApplicationRecord validates :name, presence: true validates :phone, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + end diff --git a/config/routes.rb b/config/routes.rb index ea93a175e..6a76147a1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,7 @@ resources :customers, only: [:index, :show, :create] resources :movies, only: [:index, :show, :create] -# GET "/zomg", + get "/zomg", to: "customers#zomg", as: "zomg" # GET /movies show all movies # GET /movies/:id shows a movie with the provided id diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..8d3e3541d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,45 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + # it successfully sends back data, 200 ok + + # error with error message (ex non existent customer) + + describe "index" do + # These tests are a little verbose - yours do not need to be + # this explicit. + it "is a real working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(name phone registered_at postal_code) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end + end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 200c9d82d..a1f948888 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -10,10 +10,10 @@ donald: phone: "0987654321" two: - name: MyString + name: Daisy registered_at: 2019-05-14 12:51:17 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 321 Walnut St + city: Otherworld + state: Montana + postal_code: "88888" + phone: "3334445555" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index bb267fb98..49c9e7bc9 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -9,11 +9,17 @@ end it "requires name and phone number" do - required_fields = [:name, :phone] + required_fields = [:name, :phone, :postal_code, :registered_at] required_fields.each do |field| customer[field] = nil expect(customer.valid?).must_equal false customer.reload end end + + it 'registered at must be date' do + customer.registered_at = "hi!" + expect(customer.valid?).must_equal false + customer.reload + end end From 3dc1b03dcd0014e69eafbb9f7307c928f1537832 Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Tue, 14 May 2019 13:58:57 -0700 Subject: [PATCH 07/25] customer index controller tests passed --- app/controllers/customers_controller.rb | 5 +++++ app/models/customer.rb | 1 - test/controllers/customers_controller_test.rb | 4 ++-- test/models/customer_test.rb | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ad918521b..2f228e6d9 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,9 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render status: :ok, json: customers.as_json(only: [:name, :postal_code, :registered_at, :id]) + end + def zomg render json: { message: "it works!"}, status: :ok diff --git a/app/models/customer.rb b/app/models/customer.rb index c84aa348a..b86ab97d1 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,5 @@ class Customer < ApplicationRecord validates :name, presence: true - validates :phone, presence: true validates :registered_at, presence: true validates :postal_code, presence: true diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 8d3e3541d..5a0face6b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -29,11 +29,11 @@ get customers_path body = JSON.parse(response.body) - body.length.must_equal customer.count + body.length.must_equal Customer.count end it "returns customers with exactly the required fields" do - keys = %w(name phone registered_at postal_code) + keys = %w(id name postal_code registered_at) get customers_path body = JSON.parse(response.body) body.each do |customer| diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 49c9e7bc9..3f8264d18 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -9,7 +9,7 @@ end it "requires name and phone number" do - required_fields = [:name, :phone, :postal_code, :registered_at] + required_fields = [:name, :postal_code, :registered_at] required_fields.each do |field| customer[field] = nil expect(customer.valid?).must_equal false From 2ab3df470d9f7c8200408d2c0a121b1100d1288a Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Tue, 14 May 2019 14:31:50 -0700 Subject: [PATCH 08/25] edge case tested --- test/controllers/customers_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5a0face6b..bb9536c3a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -40,6 +40,6 @@ customer.keys.sort.must_equal keys end end - end + end end From 221337aba5924c90b6331fe741544ac98d49c4bf Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Tue, 14 May 2019 14:33:29 -0700 Subject: [PATCH 09/25] movie controller and controller tests added --- app/controllers/movies_controller.rb | 34 +++++++++ app/models/movie.rb | 2 + test/controllers/movies_controller_test.rb | 85 +++++++++++++++++++++- test/models/movie_test.rb | 2 +- 4 files changed, 119 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..8671c58dc 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,36 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), + status: :ok + end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie + render json: movie.as_json(only: [[:title, :overview, :release_date, :inventory]]), + status: :ok + else + render json: { ok: false, errors: { movie: ["Movie not found"] } }, + status: :not_found + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: { id: movie.id }, status: :ok + else + render json: { ok: false, errors: movie.errors.messages }, + status: :bad_request + end + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 0844e541a..214f65b1b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,4 +2,6 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, presence: true validates :inventory, numericality: true + validates :overview, presence: true + validates :release_date, presence: true end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..14ec20caf 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,86 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + + it "returns json" do + get movies_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + keys = %w(id release_date title) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + end + + describe "show" do + it "can get a movie" do + get movie_path(movies(:two).id) + must_respond_with :success + end + end + + describe "create" do + let(:movie_data) { + { + title: "Jack", + overview: "Captain Barbossa", + release_date: Time.now, + inventory: 7, + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: { movie: movie_data } + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + + movie = Movie.find_by(title: "Jack") + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "returns an error for invalid movie data" do + movie_data["title"] = nil + + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 8fb57331b..5ab3f142b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -8,7 +8,7 @@ end it "requires title, and inventory" do - required_fields = [:title, :inventory] + required_fields = [:title, :overview, :release_date, :inventory] required_fields.each do |field| movie[field] = nil From 1c6009351f373a5d45a70c3c0cafbd48a9c59396 Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Tue, 14 May 2019 14:47:14 -0700 Subject: [PATCH 10/25] date parsed from string input, movie controller --- app/controllers/movies_controller.rb | 4 ++++ test/controllers/movies_controller_test.rb | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 8671c58dc..7580613c4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,6 +20,10 @@ def show def create movie = Movie.new(movie_params) + if params[:release_date] + movie.release_date = Date.parse(params[:release_date]).strftime('%Y-%m-%d') + end + if movie.save render json: { id: movie.id }, status: :ok else diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 14ec20caf..b039a6f36 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -48,7 +48,7 @@ { title: "Jack", overview: "Captain Barbossa", - release_date: Time.now, + release_date: "2019-05-14", inventory: 7, } } @@ -64,6 +64,7 @@ movie = Movie.find_by(title: "Jack") expect(movie.title).must_equal movie_data[:title] + expect(movie.release_date).must_be_kind_of Date must_respond_with :success end From a8c83bca714e9a96ed1d33624cba5748763f185c Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Tue, 14 May 2019 15:37:26 -0700 Subject: [PATCH 11/25] updated for available inventory requirement --- app/controllers/movies_controller.rb | 2 +- app/models/movie.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7580613c4..10b104edb 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,7 +9,7 @@ def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [[:title, :overview, :release_date, :inventory]]), + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory], methods: [:available_inventory]), status: :ok else render json: { ok: false, errors: { movie: ["Movie not found"] } }, diff --git a/app/models/movie.rb b/app/models/movie.rb index 214f65b1b..decd8cbc4 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,4 +4,8 @@ class Movie < ApplicationRecord validates :inventory, numericality: true validates :overview, presence: true validates :release_date, presence: true + + def available_inventory + return self.inventory + end end From 2748c19a0bcc21f95167b33ff3e34a8ea79ba8ba Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Tue, 14 May 2019 16:04:36 -0700 Subject: [PATCH 12/25] removed required param from movie controller --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 10b104edb..1d34975b9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -35,6 +35,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b039a6f36..a391f3a47 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -44,18 +44,17 @@ end describe "create" do - let(:movie_data) { + movie_data = { title: "Jack", overview: "Captain Barbossa", release_date: "2019-05-14", inventory: 7, } - } it "creates a new movie given valid data" do expect { - post movies_path, params: { movie: movie_data } + post movies_path, params: movie_data }.must_change "Movie.count", 1 body = JSON.parse(response.body) From 69a1d9d65da340c4593723b0546c35d65fb96b1a Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Tue, 14 May 2019 16:06:08 -0700 Subject: [PATCH 13/25] got rid of require in customer controller --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 2 +- app/models/customer.rb | 5 +++ test/controllers/customers_controller_test.rb | 2 +- test/models/customer_test.rb | 38 +++++++++++-------- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 2f228e6d9..5884fde48 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render status: :ok, json: customers.as_json(only: [:name, :postal_code, :registered_at, :id]) + render status: :ok, json: customers.as_json(only: [:name, :phone, :postal_code, :registered_at, :id], methods: [:movies_checked_out_count]) end def zomg diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 10b104edb..1d34975b9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -35,6 +35,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index b86ab97d1..7254c5db6 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,5 +2,10 @@ class Customer < ApplicationRecord validates :name, presence: true validates :registered_at, presence: true validates :postal_code, presence: true + validates :phone, presence: true + + def movies_checked_out_count + return 0 + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index bb9536c3a..168fda248 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -33,7 +33,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(id name postal_code registered_at) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) get customers_path body = JSON.parse(response.body) body.each do |customer| diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 3f8264d18..747e700c7 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,25 +1,33 @@ require "test_helper" -require 'pry' +require "pry" describe Customer do let(:customer) { customers(:donald) } - it "can be created" do - expect(customer.valid?).must_equal true - end + describe "validations" do + it "can be created" do + expect(customer.valid?).must_equal true + end + + it "requires name, phone number, postal code, and registered at" do + required_fields = [:name, :phone, :postal_code, :registered_at] + required_fields.each do |field| + customer[field] = nil + expect(customer.valid?).must_equal false + customer.reload + end + end - it "requires name and phone number" do - required_fields = [:name, :postal_code, :registered_at] - required_fields.each do |field| - customer[field] = nil - expect(customer.valid?).must_equal false - customer.reload + it "registered at must be date" do + customer.registered_at = "hi!" + expect(customer.valid?).must_equal false + customer.reload end end - it 'registered at must be date' do - customer.registered_at = "hi!" - expect(customer.valid?).must_equal false - customer.reload - end + describe "custom methods" do + it "returns 0 for checked out count" do + expect(customer.movies_checked_out_count).must_equal 0 + end + end end From 2c8613a9d9becdac473e24d3b6e3da3d11988104 Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Tue, 14 May 2019 16:27:01 -0700 Subject: [PATCH 14/25] rental model and controller created, foreign keys added to schema --- app/controllers/rentals_controller.rb | 2 ++ app/models/rental.rb | 2 ++ db/migrate/20190514232504_create_rentals.rb | 10 ++++++++++ .../20190514232528_foreign_keysto_rentals.rb | 6 ++++++ db/schema.rb | 15 ++++++++++++++- test/controllers/rentals_controller_test.rb | 7 +++++++ test/fixtures/rentals.yml | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 8 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514232504_create_rentals.rb create mode 100644 db/migrate/20190514232528_foreign_keysto_rentals.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_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/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20190514232504_create_rentals.rb b/db/migrate/20190514232504_create_rentals.rb new file mode 100644 index 000000000..c98328095 --- /dev/null +++ b/db/migrate/20190514232504_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :checkout_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/migrate/20190514232528_foreign_keysto_rentals.rb b/db/migrate/20190514232528_foreign_keysto_rentals.rb new file mode 100644 index 000000000..5835b32cb --- /dev/null +++ b/db/migrate/20190514232528_foreign_keysto_rentals.rb @@ -0,0 +1,6 @@ +class ForeignKeystoRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index f3cd12190..b51a1f5bc 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: 2019_05_14_195149) do +ActiveRecord::Schema.define(version: 2019_05_14_232528) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,17 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_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 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 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..27e9faff3 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: 2019-05-14 + due_date: 2019-05-14 + +two: + checkout_date: 2019-05-14 + due_date: 2019-05-14 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 d313caf1cb39d0391869a1c379db004f17064747 Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Wed, 15 May 2019 11:57:21 -0700 Subject: [PATCH 15/25] movie model and controller tests refactored for validation flexibility --- app/models/movie.rb | 4 +- test/controllers/movies_controller_test.rb | 80 ++++++++++++++++++---- test/models/movie_test.rb | 2 +- 3 files changed, 70 insertions(+), 16 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index decd8cbc4..de9c68468 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,8 +2,8 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, presence: true validates :inventory, numericality: true - validates :overview, presence: true - validates :release_date, presence: true + # validates :overview, presence: true + # validates :release_date, presence: true def available_inventory return self.inventory diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index a391f3a47..26a2ac0f6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -41,21 +41,76 @@ get movie_path(movies(:two).id) must_respond_with :success end + + it "returns JSON with bogus data" do + get movie_path(-1) + expect(response.header["Content-Type"]).must_include "json" + end + + # success case: retrieves json for missing field + it "returns all keys, even with empty non-required field" do + movie = Movie.create!(title: "Sparrow", + release_date: "2019-05-14", + inventory: 7) + + get movie_path(movie) + + must_respond_with :success + + body = JSON.parse(response.body) + expect(body["overview"]).must_be_nil + + keys = %w(available_inventory inventory overview release_date title) + body.keys.sort.must_equal keys + end + + # failure case, responds with 404 + it 'responds with 404 for movie not found' do + id = -1 + get movie_path(id) + must_respond_with :not_found + end + end describe "create" do - movie_data = - { + before do + @movie_data = + { + title: "Jack", + overview: "Captain Barbossa", + release_date: "2019-05-14", + inventory: 7, + } + end + + it "creates a new movie given valid data" do + expect { + post movies_path, params: @movie_data + }.must_change "Movie.count", +1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + + movie = Movie.find_by(title: "Jack") + + expect(movie.title).must_equal @movie_data[:title] + expect(movie.overview).must_equal @movie_data[:overview] + expect(movie.release_date).must_be_kind_of Date + expect(movie.inventory).must_equal @movie_data[:inventory] + + must_respond_with :success + end + + it 'creates data with empty non-required fields' do + movie_data = { title: "Jack", - overview: "Captain Barbossa", - release_date: "2019-05-14", inventory: 7, } - it "creates a new movie given valid data" do expect { - post movies_path, params: movie_data - }.must_change "Movie.count", 1 + post movies_path, params: movie_data + }.must_change "Movie.count", 1 body = JSON.parse(response.body) expect(body).must_be_kind_of Hash @@ -63,16 +118,16 @@ movie = Movie.find_by(title: "Jack") expect(movie.title).must_equal movie_data[:title] - expect(movie.release_date).must_be_kind_of Date + expect(movie.inventory).must_equal movie_data[:inventory] must_respond_with :success - end + end it "returns an error for invalid movie data" do - movie_data["title"] = nil + @movie_data["title"] = nil expect { - post movies_path, params: { movie: movie_data } - }.wont_change "Movie.count" + post movies_path, params: { movie: @movie_data } + }.wont_change "Movie.count" body = JSON.parse(response.body) @@ -81,6 +136,5 @@ expect(body["errors"]).must_include "title" must_respond_with :bad_request end - end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 5ab3f142b..8fb57331b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -8,7 +8,7 @@ end it "requires title, and inventory" do - required_fields = [:title, :overview, :release_date, :inventory] + required_fields = [:title, :inventory] required_fields.each do |field| movie[field] = nil From 581df1a5b8b2a4f7ad16e5b1966fbedb24ccd8e2 Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Wed, 15 May 2019 13:06:04 -0700 Subject: [PATCH 16/25] customer model and controller tests refactored --- app/models/customer.rb | 2 -- test/models/customer_test.rb | 10 ++-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 7254c5db6..fd761cdfc 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,7 +1,5 @@ class Customer < ApplicationRecord validates :name, presence: true - validates :registered_at, presence: true - validates :postal_code, presence: true validates :phone, presence: true def movies_checked_out_count diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 747e700c7..b17e8278c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -9,20 +9,14 @@ expect(customer.valid?).must_equal true end - it "requires name, phone number, postal code, and registered at" do - required_fields = [:name, :phone, :postal_code, :registered_at] + it "requires name and phone number" do + required_fields = [:name, :phone] required_fields.each do |field| customer[field] = nil expect(customer.valid?).must_equal false customer.reload end end - - it "registered at must be date" do - customer.registered_at = "hi!" - expect(customer.valid?).must_equal false - customer.reload - end end describe "custom methods" do From 297083ee6143d3001b7394f09f34fe0fd5715c10 Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Wed, 15 May 2019 15:08:21 -0700 Subject: [PATCH 17/25] rental schema updated, and controller actions created --- app/controllers/rentals_controller.rb | 46 +++++++++++++++++++ app/models/customer.rb | 15 ++++-- app/models/movie.rb | 11 +++++ app/models/rental.rb | 10 ++++ config/routes.rb | 7 +-- ...0190515215154_add_checkin_dateto_rental.rb | 5 ++ db/schema.rb | 3 +- 7 files changed, 90 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20190515215154_add_checkin_dateto_rental.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..84156d867 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,48 @@ +require 'date' + class RentalsController < ApplicationController + def checkout + if rental_params[:customer_id] && rental_params[:movie_id] + rental = Rental.new(rental_params) + if rental.is_available? + rental.checkout_date = Date.today + rental.due_date = Date.today + 1.week + if rental.save + movie = Movie.find(rental.movie_id) + movie.reduce_inventory + render json: rental.as_json(only: [:customer_id, :movie_id] ), status: :ok + else + render json: { ok: false, errors: rental.errors.messages }, + status: :bad_request + end + else + render json: { ok: false, errors: rental.errors.messages }, + status: :bad_request + end + end + end + + def checkin + rental = Rental.find_by(id: params[:id]) + + if rental + if rental.update(checkin_date: Date.today) + movie = Movie.find(rental.movie_id) + movie.increase_inventory + render json: rental.as_json(only: [:customer_id, :movie_id] ), status: :ok + else + render json: { ok: false, errors: rental.errors.messages }, + status: :bad_request + end + else + render json: { ok: false, errors: { rental: ["Rental not found"] }}, + status: :not_found + end + end + + private + + def rental_params + return params.permit(:movie_id, :customer_id) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index fd761cdfc..9d2bba86c 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,9 +1,18 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals + validates :name, presence: true validates :phone, presence: true def movies_checked_out_count - return 0 - end + checkouts = [] + Rental.all.each do |rental| + if rental.customer_id == self.id && rental.checkin_date.nil? + checkouts << rental + end + end -end + return checkouts.count + end +end \ No newline at end of file diff --git a/app/models/movie.rb b/app/models/movie.rb index de9c68468..ad96e34d3 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,7 @@ class Movie < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals + validates :title, presence: true validates :inventory, presence: true validates :inventory, numericality: true @@ -8,4 +11,12 @@ class Movie < ApplicationRecord def available_inventory return self.inventory end + + def reduce_inventory + return self.update(inventory: self.inventory - 1) + end + + def increase_inventory + return self.update(inventory: self.inventory + 1) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..c762db992 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,12 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer + + validates :checkout_date, presence: true + validates :due_date, presence: true + + def is_available? + return self.movie.available_inventory > 0 if self.customer + return false + end end diff --git a/config/routes.rb b/config/routes.rb index 6a76147a1..a17fa6b62 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,9 +6,10 @@ get "/zomg", to: "customers#zomg", as: "zomg" -# GET /movies show all movies -# GET /movies/:id shows a movie with the provided id -# POST /movies add a movie to the collection + + resources :rentals + post "rentals/check-out", to: "rentals#checkout", as: "checkout" + post "rentals/check-in", to: "rentals#checkin", as: "checkin" end diff --git a/db/migrate/20190515215154_add_checkin_dateto_rental.rb b/db/migrate/20190515215154_add_checkin_dateto_rental.rb new file mode 100644 index 000000000..1219b9c5b --- /dev/null +++ b/db/migrate/20190515215154_add_checkin_dateto_rental.rb @@ -0,0 +1,5 @@ +class AddCheckinDatetoRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkin_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index b51a1f5bc..32c19bb3a 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: 2019_05_14_232528) do +ActiveRecord::Schema.define(version: 2019_05_15_215154) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,7 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" + t.date "checkin_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 90ebc49ff8a7299096a713d7b3d5547de30d2c8f Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Wed, 15 May 2019 15:20:39 -0700 Subject: [PATCH 18/25] corrected checkin action --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 84156d867..e4946fd99 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -23,7 +23,7 @@ def checkout end def checkin - rental = Rental.find_by(id: params[:id]) + rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) if rental if rental.update(checkin_date: Date.today) From aa3321d36bcdaaa9041aca3be07224766ad6757a Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Wed, 15 May 2019 15:56:02 -0700 Subject: [PATCH 19/25] checkout tests initiated, invalid rental data test has errors --- app/controllers/rentals_controller.rb | 5 ++- test/controllers/rentals_controller_test.rb | 45 +++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e4946fd99..601e6cdf5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,12 +3,13 @@ class RentalsController < ApplicationController def checkout if rental_params[:customer_id] && rental_params[:movie_id] + movie = Movie.find_by(rental.movie_id) rental = Rental.new(rental_params) - if rental.is_available? + if rental.is_available? && movie rental.checkout_date = Date.today rental.due_date = Date.today + 1.week if rental.save - movie = Movie.find(rental.movie_id) + movie.reduce_inventory render json: rental.as_json(only: [:customer_id, :movie_id] ), status: :ok else diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..c9e5f1b82 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,4 +4,49 @@ # it "must be a real test" do # flunk "Need real tests" # end + + describe 'checkout' do + before do + @rental_data = { + customer_id: Customer.first.id, + movie_id: Movie.last.id + } + end + + it "creates a new rental given valid data" do + expect { + post checkout_path, params: @rental_data + }.must_change "Rental.count", +1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + + rental = Rental.last + + expect(rental.customer_id).must_equal @rental_data[:customer_id] + expect(rental.movie_id).must_equal @rental_data[:movie_id] + + + must_respond_with :success + end + + it "returns a JSON with error for invalid rental data" do + @rental_data["movie_id"] = -1 + + expect { + post checkout_path, params: { rental: @rental_data } + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(response.header["Content-Type"]).must_include "json" + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + + must_respond_with :bad_request + end + end + + describe 'checkin' do + end end From 4e98c48c7531a4214f546d0c217c89aef168642e Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Thu, 16 May 2019 10:13:48 -0700 Subject: [PATCH 20/25] refactor of movie checkout method in customer model --- app/models/customer.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 9d2bba86c..3a12ce0d8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -7,9 +7,10 @@ class Customer < ApplicationRecord def movies_checked_out_count checkouts = [] - Rental.all.each do |rental| - if rental.customer_id == self.id && rental.checkin_date.nil? - checkouts << rental + + self.rentals.each do |rental| + if rental.checkin_date.nil? + checkouts << rental end end From bf8c42201a99617e59f25332bc9146ea3f496e4b Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Thu, 16 May 2019 10:14:45 -0700 Subject: [PATCH 21/25] removed commented out code in customer controller test --- test/controllers/customers_controller_test.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 168fda248..2858bedef 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,13 +1,7 @@ require "test_helper" describe CustomersController do - # it successfully sends back data, 200 ok - - # error with error message (ex non existent customer) - describe "index" do - # These tests are a little verbose - yours do not need to be - # this explicit. it "is a real working route" do get customers_path must_respond_with :success From c89b5cd48fc6e4a5dc26deb66fef752dc9e80147 Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Thu, 16 May 2019 10:32:05 -0700 Subject: [PATCH 22/25] added rental availiability custom validation, checkout tests passed --- app/controllers/rentals_controller.rb | 50 +++++++++++---------- app/models/movie.rb | 4 ++ app/models/rental.rb | 6 ++- test/controllers/movies_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 26 ++++++++--- test/models/rental_test.rb | 15 +++++-- 6 files changed, 67 insertions(+), 36 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 601e6cdf5..eb5f5d24d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,25 +1,29 @@ -require 'date' +require "date" class RentalsController < ApplicationController def checkout - if rental_params[:customer_id] && rental_params[:movie_id] - movie = Movie.find_by(rental.movie_id) - rental = Rental.new(rental_params) - if rental.is_available? && movie - rental.checkout_date = Date.today - rental.due_date = Date.today + 1.week - if rental.save - - movie.reduce_inventory - render json: rental.as_json(only: [:customer_id, :movie_id] ), status: :ok - else - render json: { ok: false, errors: rental.errors.messages }, - status: :bad_request - end - else - render json: { ok: false, errors: rental.errors.messages }, - status: :bad_request - end + # if rental_params[:customer_id] && rental_params[:movie_id] + + rental = Rental.new(rental_params) + # binding.pry + rental.checkout_date = Date.today + rental.due_date = Date.today + 1.week + + movie = Movie.find_by(id: rental_params[:movie_id]) + + # binding.pry + unless movie + render json: { ok: false, errors: rental.errors.messages }, + status: :bad_request + return + end + + if rental.save + movie.reduce_inventory + render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok + else + render json: { ok: false, errors: rental.errors.messages }, + status: :bad_request end end @@ -30,14 +34,14 @@ def checkin if rental.update(checkin_date: Date.today) movie = Movie.find(rental.movie_id) movie.increase_inventory - render json: rental.as_json(only: [:customer_id, :movie_id] ), status: :ok + render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok else render json: { ok: false, errors: rental.errors.messages }, - status: :bad_request + status: :bad_request end else - render json: { ok: false, errors: { rental: ["Rental not found"] }}, - status: :not_found + render json: { ok: false, errors: { rental: ["Rental not found"] } }, + status: :not_found end end diff --git a/app/models/movie.rb b/app/models/movie.rb index ad96e34d3..3bc96c4e5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -19,4 +19,8 @@ def reduce_inventory def increase_inventory return self.update(inventory: self.inventory + 1) end + + def is_available? + return self.available_inventory > 0 + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index c762db992..dc13b81ca 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,9 +4,11 @@ class Rental < ApplicationRecord validates :checkout_date, presence: true validates :due_date, presence: true + validate :is_available? def is_available? - return self.movie.available_inventory > 0 if self.customer - return false + errors.add(:movie, "availiable quantity must be more than 0") unless movie.available_inventory > 0 end + end + diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 26a2ac0f6..66e8da4c4 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -126,7 +126,7 @@ @movie_data["title"] = nil expect { - post movies_path, params: { movie: @movie_data } + post movies_path, params: @movie_data }.wont_change "Movie.count" body = JSON.parse(response.body) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c9e5f1b82..5df1dd2e3 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,9 +1,6 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end describe 'checkout' do before do @@ -26,15 +23,32 @@ expect(rental.customer_id).must_equal @rental_data[:customer_id] expect(rental.movie_id).must_equal @rental_data[:movie_id] - must_respond_with :success end + it 'does returns error has if movie is unavailiable' do + movie = Movie.find_by(id: @rental_data[:movie_id]) + movie.inventory = 0 + movie.save + + expect { + post checkout_path, params: @rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(response.header["Content-Type"]).must_include "json" + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + + must_respond_with :bad_request + end + it "returns a JSON with error for invalid rental data" do - @rental_data["movie_id"] = -1 + @rental_data["customer_id"] = -1 expect { - post checkout_path, params: { rental: @rental_data } + post checkout_path, params: @rental_data }.wont_change "Rental.count" body = JSON.parse(response.body) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..3071bba0e 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,16 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { Rental.new(checkout_date: Time.now, due_date: Time.now + 2, customer: Customer.first, movie: Movie.first) } + + it 'does returns error has if movie is unavailiable' do + rental.movie.inventory = 0 + + rental.save + error_messages = rental.errors.messages + expect(error_messages).must_include :movie + expect(error_messages).must_be_kind_of Hash + end + - it "must be valid" do - value(rental).must_be :valid? - end end From 31ed6195397dfb1d4fa4aa08300a01fe93936309 Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Thu, 16 May 2019 13:18:37 -0700 Subject: [PATCH 23/25] all rental model validation tests written and passed --- app/controllers/rentals_controller.rb | 4 -- app/models/movie.rb | 3 -- test/models/rental_test.rb | 62 +++++++++++++++++++++++---- 3 files changed, 54 insertions(+), 15 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index eb5f5d24d..3b243cec7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,16 +2,12 @@ class RentalsController < ApplicationController def checkout - # if rental_params[:customer_id] && rental_params[:movie_id] - rental = Rental.new(rental_params) - # binding.pry rental.checkout_date = Date.today rental.due_date = Date.today + 1.week movie = Movie.find_by(id: rental_params[:movie_id]) - # binding.pry unless movie render json: { ok: false, errors: rental.errors.messages }, status: :bad_request diff --git a/app/models/movie.rb b/app/models/movie.rb index 3bc96c4e5..2f2c63d07 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -20,7 +20,4 @@ def increase_inventory return self.update(inventory: self.inventory + 1) end - def is_available? - return self.available_inventory > 0 - end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3071bba0e..69c470fbb 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,16 +1,62 @@ require "test_helper" -describe Rental do - let(:rental) { Rental.new(checkout_date: Time.now, due_date: Time.now + 2, customer: Customer.first, movie: Movie.first) } +describe 'Rental' do + let(:customer) {Customer.first} + let(:movie) {Movie.first} + let(:rental) { Rental.new(checkout_date: Time.now, due_date: Time.now + 2, customer: customer, movie: movie) } + describe 'validations' do + it 'passes validations with good data' do + movie.inventory = 2 + expect(rental).must_be :valid? + end - it 'does returns error has if movie is unavailiable' do - rental.movie.inventory = 0 + it "does returns has if movie is unavailiable" do + movie.inventory = 0 + expect(rental.valid?).must_equal false + end - rental.save - error_messages = rental.errors.messages - expect(error_messages).must_include :movie - expect(error_messages).must_be_kind_of Hash + it 'requires checkout date' do + rental.checkout_date = nil + expect(rental.valid?).must_equal false + end + + it "requires a due date" do + rental.due_date = nil + expect(rental.valid?).must_equal false + end + end + + describe 'relationships' do + it 'has a customer' do + expect(rental.customer_id).must_equal customer.id + + customer = nil + expect(rental.valid?).must_equal false + + end + + it 'has a movie' do + expect(rental.movie_id).must_equal movie.id + + movie = nil + expect(rental.valid?).must_equal false + + end end + describe "is_availiable?" do + it "returns nil if rental is availiable" do + movie.inventory = 2 + + expect(rental.movie.inventory).must_be :>, 0 + expect(rental.is_available?).must_be_nil + end + + it "returns error if movie's inventory is 0" do + movie.inventory = 0 + expect(movie.inventory).must_equal 0 + expect(rental.is_available?).must_be_kind_of Array + end + end end From 45f2545603a700649150062cd38ad1e075c3f6a5 Mon Sep 17 00:00:00 2001 From: Shirley Chu Date: Thu, 16 May 2019 13:28:44 -0700 Subject: [PATCH 24/25] rental model tests merged in, all tests passing --- test/models/rental_test.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 69c470fbb..f3d6f0cd4 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -30,7 +30,7 @@ it 'has a customer' do expect(rental.customer_id).must_equal customer.id - customer = nil + rental.customer_id = nil expect(rental.valid?).must_equal false end @@ -38,9 +38,10 @@ it 'has a movie' do expect(rental.movie_id).must_equal movie.id - movie = nil - expect(rental.valid?).must_equal false + rental.movie_id = nil + # will raise a NoMethodError b/c can't run the is_availiable method on nil + expect{rental.valid?}.must_raise NoMethodError end end From c8367c7fe940df7efbeddba3fef23df0ae637695 Mon Sep 17 00:00:00 2001 From: Jillianne Ramirez Date: Fri, 17 May 2019 14:21:54 -0700 Subject: [PATCH 25/25] testing for checkin function complete --- app/models/rental.rb | 2 +- test/controllers/rentals_controller_test.rb | 42 +++++++++++++++++++++ test/fixtures/rentals.yml | 9 ++++- test/models/customer_test.rb | 4 +- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index dc13b81ca..017902421 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,7 +7,7 @@ class Rental < ApplicationRecord validate :is_available? def is_available? - errors.add(:movie, "availiable quantity must be more than 0") unless movie.available_inventory > 0 + errors.add(:movie, "available quantity must be more than 0") unless movie.available_inventory > 0 end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 5df1dd2e3..079208676 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -62,5 +62,47 @@ end describe 'checkin' do + let(:rental) {rentals(:one)} + + + it "checks-in a rental given valid data" do + rental_hash = { + customer_id: rental.customer.id, + movie_id: rental.movie.id, + } + + post checkin_path, params: rental_hash + + rental.reload + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + + rental = Rental.find_by(customer_id: rental_hash[:customer_id], movie_id: rental_hash[:movie_id]) + + expect(rental.customer_id).must_equal rental_hash[:customer_id] + expect(rental.movie_id).must_equal rental_hash[:movie_id] + + must_respond_with :success + end + + it "returns a JSON with error for invalid rental data" do + rental_hash = { + customer_id: rental.customer.id, + movie_id: -1, + } + + expect { + post checkout_path, params: rental_hash + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(response.header["Content-Type"]).must_include "json" + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + + must_respond_with :bad_request + end end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 27e9faff3..00c55b452 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,14 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - checkout_date: 2019-05-14 - due_date: 2019-05-14 + checkout_date: 2019-02-14 + due_date: 2019-02-14 + customer: donald + movie: one two: checkout_date: 2019-05-14 due_date: 2019-05-14 + customer: two + movie: two + diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index b17e8278c..37786c3d9 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -20,8 +20,8 @@ end describe "custom methods" do - it "returns 0 for checked out count" do - expect(customer.movies_checked_out_count).must_equal 0 + it "returns checked out count" do + expect(customer.movies_checked_out_count).must_equal 1 end end end