From 9147dd01944323814198385e72fe6406ddd7072c Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 13:53:22 -0800 Subject: [PATCH 01/50] initial setup --- .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/controllers/zomg_controller.rb | 7 + 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 +++++ .../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 | 7 + 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, 945 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/controllers/zomg_controller.rb 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/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..a9f49bedc --- /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.1' +# 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..b18ec98f4 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + 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.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.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.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.12.0) + rack (2.0.6) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + 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.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + 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.0) + 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.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.2 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/controllers/zomg_controller.rb b/app/controllers/zomg_controller.rb new file mode 100644 index 000000000..70cc18366 --- /dev/null +++ b/app/controllers/zomg_controller.rb @@ -0,0 +1,7 @@ +class ZomgController < ApplicationController + def index + + render json: "it works!" + + end +end 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..12e45e645 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +Od3w+F5OtltZ6TZNaLJBPnA5K4XEl1esDBX9P8Wn0bsQLrZVd2EDw+pIRXettRiFdLkHqrO++vaPrk6O+A/DeDx/6CzrpKfIUTA/HwIIrT7Pb4EkqasnEFVs0sA+ik/WVpXxccr1avo9ODJIhdjrVu+4ZiMcc+DG1y2uKxCWFgVaTMIPgsaJ76DgixYoIlNRn0AR4ixv+uyn3rfNafX5SFGyK6+7r+G970FbGW9waP0BmXq9BgLwGCOI9MymbyrriqUxGLJPIlz0WFXC16lH9NSL10FS/3Ruf2/SHDnPYWzJ4O9AxhQzmu11CfIsYsP93mgxmTmCy37CkViiAECJiaoeUXiHyS4ZHSlCgaFl0g7u7k+53oEKotlNa1eMr9jBdAm4U4839MqFKr/yYm/3C76uDacZWikt99wb--NeH6tOD5qAznfLI7--8IdDIFrgp1nHrkmlg4xCEA== \ 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/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..76869d21d --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,7 @@ +Rails.application.routes.draw do + + +get '/zomg', to: 'zomg#index' + + +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 5534cf9bf7db2a2a84e1724c7ae39c651811ff3f Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 14:12:04 -0800 Subject: [PATCH 02/50] updated schema with fields for movie and customer --- app/models/customer.rb | 3 ++ app/models/movie.rb | 2 + db/migrate/20181105215414_create_movies.rb | 8 ++++ db/migrate/20181105215429_create_customers.rb | 8 ++++ .../20181105220430_update_movie_table.rb | 8 ++++ .../20181105220715_update_customers_table.rb | 11 ++++++ db/schema.rb | 39 +++++++++++++++++++ test/fixtures/customers.yml | 11 ++++++ test/fixtures/movies.yml | 11 ++++++ test/models/customer_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ test/test_helper.rb | 3 +- 12 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20181105215414_create_movies.rb create mode 100644 db/migrate/20181105215429_create_customers.rb create mode 100644 db/migrate/20181105220430_update_movie_table.rb create mode 100644 db/migrate/20181105220715_update_customers_table.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..d8b2e88e7 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20181105215414_create_movies.rb b/db/migrate/20181105215414_create_movies.rb new file mode 100644 index 000000000..a82569703 --- /dev/null +++ b/db/migrate/20181105215414_create_movies.rb @@ -0,0 +1,8 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181105215429_create_customers.rb b/db/migrate/20181105215429_create_customers.rb new file mode 100644 index 000000000..21dbca0f6 --- /dev/null +++ b/db/migrate/20181105215429_create_customers.rb @@ -0,0 +1,8 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181105220430_update_movie_table.rb b/db/migrate/20181105220430_update_movie_table.rb new file mode 100644 index 000000000..79dc15e84 --- /dev/null +++ b/db/migrate/20181105220430_update_movie_table.rb @@ -0,0 +1,8 @@ +class UpdateMovieTable < ActiveRecord::Migration[5.2] + def change + add_column :movies, :title, :string + add_column :movies, :overview, :string + add_column :movies, :release_date, :date + add_column :movies, :inventory, :integer + end +end diff --git a/db/migrate/20181105220715_update_customers_table.rb b/db/migrate/20181105220715_update_customers_table.rb new file mode 100644 index 000000000..0f9591964 --- /dev/null +++ b/db/migrate/20181105220715_update_customers_table.rb @@ -0,0 +1,11 @@ +class UpdateCustomersTable < ActiveRecord::Migration[5.2] + def change + add_column :customers, :name, :string + add_column :customers, :registered_at, :datetime + add_column :customers, :address, :string + add_column :customers, :city, :string + add_column :customers, :state, :string + add_column :customers, :postal_code, :string + add_column :customers, :phone, :string + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..d3ebeb486 --- /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: 2018_11_05_220715) 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + end + + create_table "movies", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/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 1a194d6ad6f015bea5aa40871e50d2a1bc87d07e Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 14:24:32 -0800 Subject: [PATCH 03/50] added new table for rentals and added associations between models --- app/models/customer.rb | 2 +- app/models/movie.rb | 1 + app/models/rental.rb | 4 ++++ db/migrate/20181105221605_create_rentals.rb | 8 ++++++++ db/migrate/20181105221710_update_rentals_table.rb | 5 +++++ db/schema.rb | 7 ++++++- test/fixtures/rentals.yml | 11 +++++++++++ test/models/rental_test.rb | 9 +++++++++ 8 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20181105221605_create_rentals.rb create mode 100644 db/migrate/20181105221710_update_rentals_table.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index d8b2e88e7..fccf21251 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,3 @@ class Customer < ApplicationRecord - + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..b8b339cbc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..34d3f4df8 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer +end diff --git a/db/migrate/20181105221605_create_rentals.rb b/db/migrate/20181105221605_create_rentals.rb new file mode 100644 index 000000000..328e5f49a --- /dev/null +++ b/db/migrate/20181105221605_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181105221710_update_rentals_table.rb b/db/migrate/20181105221710_update_rentals_table.rb new file mode 100644 index 000000000..2cc155113 --- /dev/null +++ b/db/migrate/20181105221710_update_rentals_table.rb @@ -0,0 +1,5 @@ +class UpdateRentalsTable < ActiveRecord::Migration[5.2] + def change + + end +end diff --git a/db/schema.rb b/db/schema.rb index d3ebeb486..3d0de8b97 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: 2018_11_05_220715) do +ActiveRecord::Schema.define(version: 2018_11_05_221710) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,9 @@ t.integer "inventory" end + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/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 4e817f2d9cb80e041578277943b07731401adb90 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 14:39:21 -0800 Subject: [PATCH 04/50] added columns to rentals table --- db/migrate/20181105221710_update_rentals_table.rb | 5 ----- db/migrate/20181105222639_add_foreign_keys.rb | 6 ++++++ db/migrate/20181105223845_update_rentals.rb | 6 ++++++ db/schema.rb | 10 +++++++++- 4 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 db/migrate/20181105221710_update_rentals_table.rb create mode 100644 db/migrate/20181105222639_add_foreign_keys.rb create mode 100644 db/migrate/20181105223845_update_rentals.rb diff --git a/db/migrate/20181105221710_update_rentals_table.rb b/db/migrate/20181105221710_update_rentals_table.rb deleted file mode 100644 index 2cc155113..000000000 --- a/db/migrate/20181105221710_update_rentals_table.rb +++ /dev/null @@ -1,5 +0,0 @@ -class UpdateRentalsTable < ActiveRecord::Migration[5.2] - def change - - end -end diff --git a/db/migrate/20181105222639_add_foreign_keys.rb b/db/migrate/20181105222639_add_foreign_keys.rb new file mode 100644 index 000000000..c552cc250 --- /dev/null +++ b/db/migrate/20181105222639_add_foreign_keys.rb @@ -0,0 +1,6 @@ +class AddForeignKeys < 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/migrate/20181105223845_update_rentals.rb b/db/migrate/20181105223845_update_rentals.rb new file mode 100644 index 000000000..7b2bb5d14 --- /dev/null +++ b/db/migrate/20181105223845_update_rentals.rb @@ -0,0 +1,6 @@ +class UpdateRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkout, :date + add_column :rentals, :checkin, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 3d0de8b97..9bcbc3ec2 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: 2018_11_05_221710) do +ActiveRecord::Schema.define(version: 2018_11_05_223845) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -39,6 +39,14 @@ create_table "rentals", force: :cascade do |t| t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.date "checkout" + t.date "checkin" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From ae274d229aff91c3d6f8ab1ad485ca0e93fdd37f Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 15:04:58 -0800 Subject: [PATCH 05/50] added validations to models --- app/models/customer.rb | 3 ++- app/models/movie.rb | 3 +++ app/models/rental.rb | 1 + db/migrate/20181105225120_add_default_checkin_date.rb | 5 +++++ db/schema.rb | 2 +- 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20181105225120_add_default_checkin_date.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index fccf21251..8ce4b2c3d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,4 @@ class Customer < ApplicationRecord - has_many :rentals + validates :name, presence: true + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index b8b339cbc..90e197dc5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,6 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :inventory, presence: true + validates :inventory, numericality: { only_integer: true } has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..8d8580933 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,5 @@ class Rental < ApplicationRecord + validates :checkout, presence: true belongs_to :movie belongs_to :customer end diff --git a/db/migrate/20181105225120_add_default_checkin_date.rb b/db/migrate/20181105225120_add_default_checkin_date.rb new file mode 100644 index 000000000..1b84ce8b9 --- /dev/null +++ b/db/migrate/20181105225120_add_default_checkin_date.rb @@ -0,0 +1,5 @@ +class AddDefaultCheckinDate < ActiveRecord::Migration[5.2] + def change + change_column :rentals, :checkin, :date, :default => nil + end +end diff --git a/db/schema.rb b/db/schema.rb index 9bcbc3ec2..b1a131b4c 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: 2018_11_05_223845) do +ActiveRecord::Schema.define(version: 2018_11_05_225120) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From 717eedda9243693e5e58c4d43980cc6293aa274e Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 15:23:55 -0800 Subject: [PATCH 06/50] added validation testing for movies --- test/models/movie_test.rb | 59 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..62c2d37d2 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,62 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } - it "must be valid" do - value(movie).must_be :valid? + + describe 'validations' do + + it 'is valid when all fields are present' do + + @movie = Movie.new(title: 'title', inventory: 3) + result = @movie.valid? + + expect(result).must_equal true + + end + + + it 'is invalid without any inventory' do + + @movie = Movie.new(title: 'title') + result = @movie.valid? + + expect(result).must_equal false + expect(@movie.errors.messages).must_include :inventory + + end + + + it 'is invalid without a title' do + + @movie = Movie.new(inventory: 2) + result = @movie.valid? + + expect(result).must_equal false + expect(@movie.errors.messages).must_include :title + + end + + + it 'is invalid when missing both required fields' do + + @movie = Movie.new() + result = @movie.valid? + + expect(result).must_equal false + + end + + + it 'is invalid if inventory is not an integer' do + + @movie = Movie.new(title: 'title', inventory: 'abc') + result = @movie.valid? + + expect(result).must_equal false + expect(@movie.errors.messages).must_include :inventory + + end + end + end From 543921bc39d60c5252022ec178d9c0a8e6167e7d Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 15:56:24 -0800 Subject: [PATCH 07/50] added validation testing for customers --- test/models/customer_test.rb | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..f59f19f0b 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,28 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + describe 'validations' do + + it 'is valid when given a customer name' do + + @customer = Customer.new(name: 'Carly') + result = @customer.valid? + + expect(result).must_equal true + + end + + + it 'is invalid without a given customer name' do + + @customer = Customer.new() + result = @customer.valid? + + expect(result).must_equal false + expect(@customer.errors.messages).must_include :name + end + end + end From 117dd32bd10be85d73646233ea71f9e0a377d950 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 16:06:17 -0800 Subject: [PATCH 08/50] added validation tests --- test/models/movie_test.rb | 2 +- test/models/rental_test.rb | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 62c2d37d2..0158517c5 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -5,7 +5,7 @@ describe 'validations' do - it 'is valid when all fields are present' do + it 'is valid when a title and inventory number are present' do @movie = Movie.new(title: 'title', inventory: 3) result = @movie.valid? diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..0bea59f1c 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,5 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } - it "must be valid" do - value(rental).must_be :valid? - end end From b7589103f7b2ee408d513247965d168e2b610ca7 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 16:17:31 -0800 Subject: [PATCH 09/50] added routes --- config/routes.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 76869d21d..50bbfcdf3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,17 @@ Rails.application.routes.draw do -get '/zomg', to: 'zomg#index' + get '/zomg', to: 'zomg#index' + + get '/customers', to: 'customers#index', as: 'customers' + + get '/movies', to: 'movies#index', as: 'movies' + + get 'movies', to: 'movies#show', as: 'movie' + + post '/movies', to: 'movies#create' + + end From a31a6cfc3f8fb7dec9936a60efa3d6ced46b6368 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 16:30:28 -0800 Subject: [PATCH 10/50] created customers and movies controller --- app/controllers/customers_controller.rb | 19 +++++++++++++++++++ app/controllers/movies_controller.rb | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..0942ded40 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,19 @@ +class CustomersController < ApplicationController + + def index + customers = Customer.all + # render json: jsonify(customers), status: :ok + render json: customers.as_json( only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count) + end + + + + + private + + def jsonify(customer) + return customer_data.as_json( only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) + end + + +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..e1c7f9da6 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,3 @@ +class MoviesController < ApplicationController + +end From e129c05b153b9d22f32b0507219743932d40c7bd Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 16:41:41 -0800 Subject: [PATCH 11/50] added index action for customers controller --- app/controllers/customers_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0942ded40..44c39f037 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -8,7 +8,6 @@ def index - private def jsonify(customer) From 02ac7d760aec0f28860a0c28784743fcb19168b6 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 16:46:44 -0800 Subject: [PATCH 12/50] added index and create actions for movies controller --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 44c39f037..e0e6cfdde 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,7 +3,7 @@ class CustomersController < ApplicationController def index customers = Customer.all # render json: jsonify(customers), status: :ok - render json: customers.as_json( only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count) + render json: customers.as_json( only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count] ) end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e1c7f9da6..7a200c883 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,3 +1,26 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + + render json: movies.as_json( only: [:id, :title, :release_date]) + + end + + def create + movie = Movie.new(movie_params) + if movie.save + render json: { id: movie.id } + #else + #add error + end + + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end + end From ffb5f3f4cd728cf458910bd96e816ff6d5bf2280 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 16:49:36 -0800 Subject: [PATCH 13/50] added movies_checked_out_column to movies table --- app/controllers/movies_controller.rb | 26 +++++++++++++++++++ ...106004821_add_movies_checked_out_column.rb | 5 ++++ db/schema.rb | 3 ++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 app/controllers/movies_controller.rb create mode 100644 db/migrate/20181106004821_add_movies_checked_out_column.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..7a200c883 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,26 @@ +class MoviesController < ApplicationController + + def index + movies = Movie.all + + render json: movies.as_json( only: [:id, :title, :release_date]) + + end + + def create + movie = Movie.new(movie_params) + if movie.save + render json: { id: movie.id } + #else + #add error + end + + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end + +end diff --git a/db/migrate/20181106004821_add_movies_checked_out_column.rb b/db/migrate/20181106004821_add_movies_checked_out_column.rb new file mode 100644 index 000000000..ff0ac0cd2 --- /dev/null +++ b/db/migrate/20181106004821_add_movies_checked_out_column.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutColumn < ActiveRecord::Migration[5.2] + def change + add_column :movies, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index b1a131b4c..c35ee9018 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: 2018_11_05_225120) do +ActiveRecord::Schema.define(version: 2018_11_06_004821) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,6 +34,7 @@ t.string "overview" t.date "release_date" t.integer "inventory" + t.integer "movies_checked_out_count", default: 0 end create_table "rentals", force: :cascade do |t| From 0c075153efab9bb84a6c68534d88bad4fc296299 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Mon, 5 Nov 2018 16:57:04 -0800 Subject: [PATCH 14/50] changed db to add movies_checked_out column to customers --- db/migrate/20181106005514_remove_column_from_movies.rb | 5 +++++ db/migrate/20181106005553_add_column_to_customers.rb | 5 +++++ db/schema.rb | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20181106005514_remove_column_from_movies.rb create mode 100644 db/migrate/20181106005553_add_column_to_customers.rb diff --git a/db/migrate/20181106005514_remove_column_from_movies.rb b/db/migrate/20181106005514_remove_column_from_movies.rb new file mode 100644 index 000000000..de4e96eb0 --- /dev/null +++ b/db/migrate/20181106005514_remove_column_from_movies.rb @@ -0,0 +1,5 @@ +class RemoveColumnFromMovies < ActiveRecord::Migration[5.2] + def change + remove_column :movies, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/migrate/20181106005553_add_column_to_customers.rb b/db/migrate/20181106005553_add_column_to_customers.rb new file mode 100644 index 000000000..8299980a4 --- /dev/null +++ b/db/migrate/20181106005553_add_column_to_customers.rb @@ -0,0 +1,5 @@ +class AddColumnToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index c35ee9018..d60531b0b 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: 2018_11_06_004821) do +ActiveRecord::Schema.define(version: 2018_11_06_005553) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "state" t.string "postal_code" t.string "phone" + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -34,7 +35,6 @@ t.string "overview" t.date "release_date" t.integer "inventory" - t.integer "movies_checked_out_count", default: 0 end create_table "rentals", force: :cascade do |t| From 3f0e007c4010d1498988af746e7217ab2ba96952 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Tue, 6 Nov 2018 11:47:26 -0800 Subject: [PATCH 15/50] updated show route for movie --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 50bbfcdf3..4a51e008c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,7 +7,7 @@ get '/movies', to: 'movies#index', as: 'movies' - get 'movies', to: 'movies#show', as: 'movie' + get '/movies/:id', to: 'movies#show', as: 'movie' post '/movies', to: 'movies#create' From 21e3bda235b582c48cd127d2cb6583a1e7882e48 Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Tue, 6 Nov 2018 12:06:44 -0800 Subject: [PATCH 16/50] error handling in the Application controller. --- app/models/application_record.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 10a4cba84..0183770da 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,3 +1,7 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true + + def render_error(status, errors) + render json: { error: errors }, status: status + end end From eed76bd06dad240990286d93e275c24441180b64 Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Tue, 6 Nov 2018 12:10:40 -0800 Subject: [PATCH 17/50] jsonify of customers is working. --- app/controllers/customers_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e0e6cfdde..caf18ee2c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,14 +3,14 @@ class CustomersController < ApplicationController def index customers = Customer.all # render json: jsonify(customers), status: :ok - render json: customers.as_json( only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count] ) + render json: jsonify(customers) end private - def jsonify(customer) + def jsonify(customer_data) return customer_data.as_json( only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end From 5bf4276306e18a17bebdac78c91f7ae3f88697bd Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Tue, 6 Nov 2018 12:12:11 -0800 Subject: [PATCH 18/50] jsonify movies. --- app/controllers/movies_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7a200c883..dd39bcb72 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,7 +3,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json( only: [:id, :title, :release_date]) + render json: jsonify(movies) end @@ -23,4 +23,8 @@ def movie_params params.require(:movie).permit(:title, :overview, :release_date, :inventory) end + def jsonify(movie_data) + return movie_data.as_json( only: [:id, :title, :release_date]) + end + end From e976d1d1a03375755c6c7e421eef70821da92731 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Tue, 6 Nov 2018 12:19:32 -0800 Subject: [PATCH 19/50] added error handling to movie create --- app/controllers/movies_controller.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index dd39bcb72..e77d03605 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,16 +3,16 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: jsonify(movies) + render json: movies.as_json( only: [:id, :title, :release_date]) end def create movie = Movie.new(movie_params) if movie.save - render json: { id: movie.id } - #else - #add error + render json: { id: movie.id, title: movie.title } + else + render_error(:bad_request, movie.errors.messages ) end end @@ -23,8 +23,4 @@ def movie_params params.require(:movie).permit(:title, :overview, :release_date, :inventory) end - def jsonify(movie_data) - return movie_data.as_json( only: [:id, :title, :release_date]) - end - end From 0f6d0505ef20387ae7b30b504c95614030193b72 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Tue, 6 Nov 2018 12:25:06 -0800 Subject: [PATCH 20/50] handled errors, added show method and added jsonify to movies controller --- app/controllers/movies_controller.rb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e77d03605..32fff21d5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,7 +3,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json( only: [:id, :title, :release_date]) + render json: jsonify(movies) end @@ -14,13 +14,26 @@ def create else render_error(:bad_request, movie.errors.messages ) end + end + def show + movie = Movie.find_by(id: params[:id]) + if movie + render json: jsonify(movie) + # else + # render_error(:not_found, { mov}) + end end + private def movie_params params.require(:movie).permit(:title, :overview, :release_date, :inventory) end + def jsonify(movie_data) + return movie_data.as_json( only: [:id, :title, :release_date] ) + end + end From 4001d4614889573610871da022ca6d958614be56 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Tue, 6 Nov 2018 15:00:37 -0800 Subject: [PATCH 21/50] fixed movies controller --- app/controllers/movies_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 32fff21d5..9d64fb5a8 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,8 +20,9 @@ def show movie = Movie.find_by(id: params[:id]) if movie render json: jsonify(movie) - # else - # render_error(:not_found, { mov}) + else + # binding.pry + # render_error(:not_found, { movie_id: ["no such movie found"] } ) end end From 03e55eca9b06cfbfc2cecc53f47c1aa8201f3b6a Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Tue, 6 Nov 2018 15:28:32 -0800 Subject: [PATCH 22/50] added rental controller & routes --- app/controllers/rentals_controller.rb | 2 ++ config/routes.rb | 8 ++++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ 3 files changed, 17 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index 4a51e008c..d0c199de1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,6 +11,14 @@ post '/movies', to: 'movies#create' + get '/rentals', to: 'rentals#index', as: 'rentals' + + get '/rentals/:id', to: 'rentals#show', as: 'rental' + + post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' + + post '/rentals/check-in', to: 'rentals#checkin', as: 'checking' + diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From fdc79ccad663502980b2d250892b4cadecb35377 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Tue, 6 Nov 2018 15:35:51 -0800 Subject: [PATCH 23/50] added default checkout date to today --- app/controllers/rentals_controller.rb | 6 ++++++ db/migrate/20181106233452_add_default_checkout.rb | 5 +++++ db/schema.rb | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20181106233452_add_default_checkout.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..e59c3c59b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,8 @@ class RentalsController < ApplicationController + + def index + + rentals = Rental.all + + end end diff --git a/db/migrate/20181106233452_add_default_checkout.rb b/db/migrate/20181106233452_add_default_checkout.rb new file mode 100644 index 000000000..6ba8e8558 --- /dev/null +++ b/db/migrate/20181106233452_add_default_checkout.rb @@ -0,0 +1,5 @@ +class AddDefaultCheckout < ActiveRecord::Migration[5.2] + def change + change_column :rentals, :checkout, :date, :default => Date.today + end +end diff --git a/db/schema.rb b/db/schema.rb index d60531b0b..84bfd4a54 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: 2018_11_06_005553) do +ActiveRecord::Schema.define(version: 2018_11_06_233452) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,7 +42,7 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" - t.date "checkout" + t.date "checkout", default: "2018-11-06" t.date "checkin" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" From 44a22cf5c154dc9b32dc1ee633332574beaf6d31 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Tue, 6 Nov 2018 15:47:19 -0800 Subject: [PATCH 24/50] created index and show action for rentals --- app/controllers/rentals_controller.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e59c3c59b..7a1e4043e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,6 +3,15 @@ class RentalsController < ApplicationController def index rentals = Rental.all + render json: rentals.as_json( except: [:created_at, :updated_at] ) end + + def show + rental_id = params[:id] + rental = Rental.find_by(id: rental_id) + if rental + render json: rental.as_json( except: [:created_at, :updated_at] ) + end + end end From ac4d9519984b4927d6ab580cfdd8869b2c2e0fea Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Tue, 6 Nov 2018 16:17:46 -0800 Subject: [PATCH 25/50] added checkout method and strong params --- app/controllers/rentals_controller.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 7a1e4043e..36e379320 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,6 +7,7 @@ def index end + def show rental_id = params[:id] rental = Rental.find_by(id: rental_id) @@ -14,4 +15,25 @@ def show render json: rental.as_json( except: [:created_at, :updated_at] ) end end + + + def checkout + rental = Rental.new(rental_params) + if rental.save + render json: { id: rental.id } + #should we be validating movie & customer ids? + end + end + + + def checkin + + end + + private + + def rental_params + params.require(:rental).permit(:movie_id, :customer_id ) + end + end From 56602ca1e52ebddc9234d05281f72f60e9d8f1c1 Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Tue, 6 Nov 2018 21:32:18 -0800 Subject: [PATCH 26/50] created simple yml files and basic relation testing for models. --- test/fixtures/customers.yml | 12 +++++++----- test/fixtures/movies.yml | 12 +++++++----- test/fixtures/rentals.yml | 12 +++++++----- test/models/movie_test.rb | 13 +++++++++++++ 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dc3ee79b5..8dc6f733e 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,8 +4,10 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +harry: + name: Harry + movies_checked_out_count: 3 + +sally: + name: Sally + movies_checked_out_count: 0 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index dc3ee79b5..8f6749ff7 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,10 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +dragon: + title: Puff the Magic Dragon + inventory: 2 + +drama: + title: Gone with the Wind + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..9a8ba7578 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,10 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +one: + movie: dragon + customer: harry + +two: + movie: drama + customer: sally diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 0158517c5..f07c79f8d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -59,4 +59,17 @@ end + describe "relations" do + it "has a list of rentals" do + movie = movies(:dragon) + movie.must_respond_to :rentals + + movie.rentals.each do |rental| + rental.must_be_kind_of Rental + end + + end + + end + end From bf60613e5b1cdefbda53cc41948e415ab9368f4e Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Tue, 6 Nov 2018 21:34:35 -0800 Subject: [PATCH 27/50] relations testing for customer. --- test/models/customer_test.rb | 14 ++++++++++++++ test/models/movie_test.rb | 1 + 2 files changed, 15 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index f59f19f0b..de6101753 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -25,4 +25,18 @@ end + describe "relations" do + + it "has a list of rentals" do + customer = customers(:sally) + customer.must_respond_to :rentals + + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + + end + + end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f07c79f8d..280c3aad2 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -60,6 +60,7 @@ end describe "relations" do + it "has a list of rentals" do movie = movies(:dragon) movie.must_respond_to :rentals From 485174e5cfbdc530f5f47547ed7cd148817426b6 Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Tue, 6 Nov 2018 21:50:05 -0800 Subject: [PATCH 28/50] basic model relations testing. --- test/models/rental_test.rb | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 0bea59f1c..a484f5e22 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,4 +2,48 @@ describe Rental do + + describe 'validations' do + + it 'is valid when a checkout date is present' do + + @rental = Rental.new(checkout: "2000-01-18") + result = @rental.valid? + + expect(result).must_equal true + + end + + + it 'is invalid without a checkout date' do + + @rental = Rental.new + result = @rental.valid? + + expect(result).must_equal false + + expect(@rental.errors.messages).must_include :checkout + + end + + end + + describe "relations" do + + it 'must relate to a movie' do + rental = rentals(:one) + + expect(rental).must_respond_to :movie + expect(rental.movie).must_equal movies(:dragon) + end + + it 'must relate to a customer' do + rental = rentals(:one) + + expect(rental).must_respond_to :customer + expect(rental.customer).must_equal customers(:harry) + end + + end + end From f316d0f94909490e9c99045414dc33c8cdac471d Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Wed, 7 Nov 2018 09:25:59 -0800 Subject: [PATCH 29/50] fixed index for movies --- app/controllers/movies_controller.rb | 6 +++--- app/controllers/rentals_controller.rb | 11 ++++++++++- config/routes.rb | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9d64fb5a8..c54fac4a2 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,7 +3,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: jsonify(movies) + render json: movies.as_json( only: [:id, :title, :release_date ]) end @@ -22,7 +22,7 @@ def show render json: jsonify(movie) else # binding.pry - # render_error(:not_found, { movie_id: ["no such movie found"] } ) + render_error(:not_found, { id: ["no such movie found"] } ) end end @@ -34,7 +34,7 @@ def movie_params end def jsonify(movie_data) - return movie_data.as_json( only: [:id, :title, :release_date] ) + return movie_data.as_json( only: [:title, :overview, :release_date, :inventory] ) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 36e379320..cec7b52cb 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,6 +13,7 @@ def show rental = Rental.find_by(id: rental_id) if rental render json: rental.as_json( except: [:created_at, :updated_at] ) + ###add errors end end @@ -22,14 +23,22 @@ def checkout if rental.save render json: { id: rental.id } #should we be validating movie & customer ids? + + ###add errors end end def checkin - + rental = Rental.find_by(id: params[:id]) + if rental + rental.c = Date.today + ###add errors + end end + + private def rental_params diff --git a/config/routes.rb b/config/routes.rb index d0c199de1..75291ae56 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,7 +17,7 @@ post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' - post '/rentals/check-in', to: 'rentals#checkin', as: 'checking' + post '/rentals/:id/check-in', to: 'rentals#checkin', as: 'checkin' From fd0d545b278e13873357ded5663ab875128b10b2 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Wed, 7 Nov 2018 10:02:39 -0800 Subject: [PATCH 30/50] added error handling to movies show --- app/controllers/movies_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c54fac4a2..ad2953793 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -17,12 +17,12 @@ def create end def show - movie = Movie.find_by(id: params[:id]) + movie_id = params[:id] + movie = Movie.find_by(id: movie_id) if movie render json: jsonify(movie) else - # binding.pry - render_error(:not_found, { id: ["no such movie found"] } ) + render json: { errors: { movie_id: ["No such movie"] } }, status: :not_found end end From 5e2b8a88dfbc4f718f8afd7ffe4a5183dd44db05 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Wed, 7 Nov 2018 10:13:24 -0800 Subject: [PATCH 31/50] added rental routes --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 75291ae56..56f6c5191 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,6 +11,9 @@ post '/movies', to: 'movies#create' + + + get '/rentals', to: 'rentals#index', as: 'rentals' get '/rentals/:id', to: 'rentals#show', as: 'rental' From 8eb417da13d9858948926a9c4e363f9abe7801b5 Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Wed, 7 Nov 2018 10:25:12 -0800 Subject: [PATCH 32/50] reconfigured rental model testing to take in movie and customer. --- test/models/rental_test.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index a484f5e22..ad63d1695 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -6,8 +6,9 @@ describe 'validations' do it 'is valid when a checkout date is present' do - - @rental = Rental.new(checkout: "2000-01-18") + movie = movies(:dragon) + customer = customers(:harry) + @rental = Rental.new(checkout: "2018-01-18", movie_id: movie.id, customer_id: customer.id) result = @rental.valid? expect(result).must_equal true @@ -16,8 +17,9 @@ it 'is invalid without a checkout date' do - - @rental = Rental.new + movie = movies(:dragon) + customer = customers(:harry) + @rental = Rental.new(movie_id: movie.id, customer_id: customer.id) result = @rental.valid? expect(result).must_equal false From f8a3e382d8740190f1576ea81f2bf57e64af4f5b Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Wed, 7 Nov 2018 10:28:14 -0800 Subject: [PATCH 33/50] created movies and customers controller testing files. --- test/controllers/customers_controller_test.rb | 0 test/controllers/movies_controller_test.rb | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..e69de29bb From f4524bf9b85daebd01b85399e07369a5146bae0c Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Wed, 7 Nov 2018 10:38:16 -0800 Subject: [PATCH 34/50] added error handling for rental show method --- app/controllers/rentals_controller.rb | 3 ++- db/migrate/20181107182731_change_checkout_date_column.rb | 5 +++++ db/migrate/20181107183241_change_checkout_again.rb | 6 ++++++ db/schema.rb | 4 ++-- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20181107182731_change_checkout_date_column.rb create mode 100644 db/migrate/20181107183241_change_checkout_again.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cec7b52cb..806e25a36 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,7 +13,8 @@ def show rental = Rental.find_by(id: rental_id) if rental render json: rental.as_json( except: [:created_at, :updated_at] ) - ###add errors + else + render json: { errors: { rental_id: ["No such rental"] } }, status: :not_found end end diff --git a/db/migrate/20181107182731_change_checkout_date_column.rb b/db/migrate/20181107182731_change_checkout_date_column.rb new file mode 100644 index 000000000..0664c2e26 --- /dev/null +++ b/db/migrate/20181107182731_change_checkout_date_column.rb @@ -0,0 +1,5 @@ +class ChangeCheckoutDateColumn < ActiveRecord::Migration[5.2] + def change + change_column :rentals, :checkout, :date + end +end diff --git a/db/migrate/20181107183241_change_checkout_again.rb b/db/migrate/20181107183241_change_checkout_again.rb new file mode 100644 index 000000000..d09334875 --- /dev/null +++ b/db/migrate/20181107183241_change_checkout_again.rb @@ -0,0 +1,6 @@ +class ChangeCheckoutAgain < ActiveRecord::Migration[5.2] + def change + change_column :rentals, :checkout, :date, :default => nil + + end +end diff --git a/db/schema.rb b/db/schema.rb index 84bfd4a54..7dbf42b29 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: 2018_11_06_233452) do +ActiveRecord::Schema.define(version: 2018_11_07_183241) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,7 +42,7 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" - t.date "checkout", default: "2018-11-06" + t.date "checkout" t.date "checkin" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" From 3bb693cab16626c09516916fe5f5c4b8e0663acd Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Wed, 7 Nov 2018 10:39:18 -0800 Subject: [PATCH 35/50] Created customer controller tests. --- test/controllers/customers_controller_test.rb | 47 +++++++++++++++++++ test/controllers/movies_controller_test.rb | 45 ++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index e69de29bb..3932a0512 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,47 @@ +require 'test_helper' + +describe CustomersController do + describe "index" do + + it "is a functioning 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(id name registered_at postal_code phone movies_checked_out_count).sort + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + + it "returns an empty array when there are no customers" do + Rental.destroy_all + Customer.destroy_all + get customers_path + expect(Customer.count).must_equal 0 + end + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e69de29bb..b5a0d4741 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,45 @@ +describe MoviesController do + describe "index" do + + it "is a functioning 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(id name registered_at postal_code phone movies_checked_out_count).sort + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + + it "returns an empty array when there are no customers" do + Rental.destroy_all + Customer.destroy_all + get customers_path + expect(Customer.count).must_equal 0 + end + end + +end From 2c26d3462bd2cbbbf92b16137ab0eb61d9f80b66 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Wed, 7 Nov 2018 10:48:36 -0800 Subject: [PATCH 36/50] added error handling for checkout method --- app/controllers/rentals_controller.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 806e25a36..cee317c5b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -23,9 +23,8 @@ def checkout rental = Rental.new(rental_params) if rental.save render json: { id: rental.id } - #should we be validating movie & customer ids? - - ###add errors + else + render_error(:bad_request, rental.errors.messages ) end end @@ -43,7 +42,7 @@ def checkin private def rental_params - params.require(:rental).permit(:movie_id, :customer_id ) + params.require(:rental).permit(:movie_id, :customer_id, :checkout ) end end From bb6e4f4d6fd7f86d6d8eb5d742a35a5bac075433 Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Wed, 7 Nov 2018 11:04:54 -0800 Subject: [PATCH 37/50] completed movies controller testing. --- app/controllers/movies_controller.rb | 3 +- test/controllers/movies_controller_test.rb | 82 ++++++++++++++++++---- 2 files changed, 69 insertions(+), 16 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ad2953793..237fdabfe 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -12,7 +12,8 @@ def create if movie.save render json: { id: movie.id, title: movie.title } else - render_error(:bad_request, movie.errors.messages ) + # render_error(:bad_request, movie.errors.messages ) + render json: {}, status: :bad_request end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b5a0d4741..dba6e67b5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -2,44 +2,96 @@ describe "index" do it "is a functioning route" do - get customers_path + get movies_path must_respond_with :success end it "returns json" do - get customers_path + get movies_path expect(response.header['Content-Type']).must_include 'json' end it "returns an Array" do - get customers_path + get movies_path body = JSON.parse(response.body) body.must_be_kind_of Array end - it "returns all of the customers" do - get customers_path + it "returns all of the movies" do + get movies_path body = JSON.parse(response.body) - body.length.must_equal Customer.count + body.length.must_equal Movie.count end - it "returns customers with exactly the required fields" do - keys = %w(id name registered_at postal_code phone movies_checked_out_count).sort - get customers_path + it "returns movies with exactly the required fields" do + keys = %w(id title release_date).sort + get movies_path body = JSON.parse(response.body) - body.each do |customer| - customer.keys.sort.must_equal keys + body.each do |movie| + movie.keys.sort.must_equal keys end end - it "returns an empty array when there are no customers" do + it "returns an empty array when there are no movies" do Rental.destroy_all - Customer.destroy_all - get customers_path - expect(Customer.count).must_equal 0 + Movie.destroy_all + get movies_path + expect(Movie.count).must_equal 0 end end + describe "create" do + let(:movie_data) { + { + title: "The Adventures of Priscilla Queen of the Desert", + release_date: "1999", + overview: "A good movie", + inventory: 4 + } + } + + 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 + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + 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" + + must_respond_with :bad_request + + end + + end + + describe "show" do + it "can get a movie" do + get movie_path(movies(:dragon).id) + must_respond_with :success + end + + it "responds with not_found if no movie is found" do + id = 3030489459834 + get movie_path(id) + must_respond_with :not_found + end + end + end From 851c6c7c023a7a4ffe654e936e69180fcb9b5c1d Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Wed, 7 Nov 2018 11:06:45 -0800 Subject: [PATCH 38/50] updated checkout method in rentals controller --- app/controllers/rentals_controller.rb | 17 ++++++++++++++--- config/routes.rb | 4 ++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cee317c5b..d7b168848 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -24,7 +24,7 @@ def checkout if rental.save render json: { id: rental.id } else - render_error(:bad_request, rental.errors.messages ) + render json: {}, status: :bad_request end end @@ -32,13 +32,24 @@ def checkout def checkin rental = Rental.find_by(id: params[:id]) if rental - rental.c = Date.today - ###add errors + rental.update(checkin: Date.today) + else + render json: { errors { rental_id: ["No such rental" ] } } end end + if @book.update(book_params) + flash[:success] = "Successfully updated book \"#{@book.title}\"" + redirect_to book_path(@book.id) + else + flash.now[:error] = "Invalid book data" + render(:edit, status: :bad_request) + end + + + private def rental_params diff --git a/config/routes.rb b/config/routes.rb index 56f6c5191..f315358e2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,7 +12,7 @@ post '/movies', to: 'movies#create' - + get '/rentals', to: 'rentals#index', as: 'rentals' @@ -20,7 +20,7 @@ post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' - post '/rentals/:id/check-in', to: 'rentals#checkin', as: 'checkin' + patch '/rentals/check-in', to: 'rentals#checkin', as: 'checkin' From 777a5810abc7dbfa0c50678a6d41eec9663149fa Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Wed, 7 Nov 2018 11:54:28 -0800 Subject: [PATCH 39/50] updated index and show tests for Rentals, and began checkout. --- app/controllers/rentals_controller.rb | 12 +-- test/controllers/rentals_controller_test.rb | 94 ++++++++++++++++++++- 2 files changed, 92 insertions(+), 14 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d7b168848..046eff57a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,22 +34,12 @@ def checkin if rental rental.update(checkin: Date.today) else - render json: { errors { rental_id: ["No such rental" ] } } + # render json: { errors { rental_id: ["No such rental" ] } } end end - if @book.update(book_params) - flash[:success] = "Successfully updated book \"#{@book.title}\"" - redirect_to book_path(@book.id) - else - flash.now[:error] = "Invalid book data" - render(:edit, status: :bad_request) - end - - - private def rental_params diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..40c228ead 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,95 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + + it "is a functioning route" do + get rentals_path + must_respond_with :success + end + + it "returns json" do + get rentals_path + expect(response.header['Content-Type']).must_include 'json' + end + + it "returns an Array" do + get rentals_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the rentals" do + get rentals_path + + body = JSON.parse(response.body) + body.length.must_equal Rental.count + end + + it "returns rentals with exactly the required fields" do + keys = %w(movie_id customer_id checkout checkin id).sort + get rentals_path + body = JSON.parse(response.body) + body.each do |rental| + rental.keys.sort.must_equal keys + end + end + + it "returns an empty array when there are no rentals" do + Rental.destroy_all + Movie.destroy_all + Customer.destroy_all + get rentals_path + expect(Rental.count).must_equal 0 + end + end + + + describe "show" do + it "can get a rental" do + get rental_path(rentals(:one).id) + must_respond_with :success + end + + it "responds with not_found if no rental is found" do + id = 3030489459834 + get rental_path(id) + must_respond_with :not_found + end + end + + describe "checkout" do + + let (:rental_params) { + { + movie_id: 3, + customer_id: 4, + checkout: "2016-11-11" + } + } + + it "checks out a movie, given valid data " do + + expect { + post checkout_path, params: { rental: rental_params } + }.must_change "Rental.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + + expect(body).must_include "id" + + rental = Rental.find(body["id"].to_i) + + must_respond_with :success + + end + + + end + + describe "checkin" do + end + end From b769df68f109958e8cb654799a2d08f9c62a4826 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Wed, 7 Nov 2018 11:55:30 -0800 Subject: [PATCH 40/50] added checkin method for rentals --- app/controllers/rentals_controller.rb | 16 +++++----------- config/routes.rb | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d7b168848..537cb109c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -30,25 +30,19 @@ def checkout def checkin - rental = Rental.find_by(id: params[:id]) + rental_id = params[:id] + rental = Rental.find_by(id: rental_id) + if rental rental.update(checkin: Date.today) + render json: { id: rental.id } else - render json: { errors { rental_id: ["No such rental" ] } } + render json: { errors: { rental_id: ["No such rental"] } }, status: :bad_request end end - if @book.update(book_params) - flash[:success] = "Successfully updated book \"#{@book.title}\"" - redirect_to book_path(@book.id) - else - flash.now[:error] = "Invalid book data" - render(:edit, status: :bad_request) - end - - private diff --git a/config/routes.rb b/config/routes.rb index f315358e2..073f2a056 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,7 +20,7 @@ post '/rentals/check-out', to: 'rentals#checkout', as: 'checkout' - patch '/rentals/check-in', to: 'rentals#checkin', as: 'checkin' + patch '/rentals/:id/check-in', to: 'rentals#checkin', as: 'checkin' From 4ae022e312030e706689efd54faf450e4baef6f0 Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Wed, 7 Nov 2018 12:01:58 -0800 Subject: [PATCH 41/50] merge conflict resolved. hopefully. --- app/controllers/rentals_controller.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 40966c91f..bf8e4ce51 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -37,20 +37,13 @@ def checkin rental.update(checkin: Date.today) render json: { id: rental.id } else -<<<<<<< HEAD + render json: { errors: { rental_id: ["No such rental"] } }, status: :bad_request -======= - # render json: { errors { rental_id: ["No such rental" ] } } ->>>>>>> 777a5810abc7dbfa0c50678a6d41eec9663149fa + end end - -<<<<<<< HEAD - -======= ->>>>>>> 777a5810abc7dbfa0c50678a6d41eec9663149fa private def rental_params From c73b8afd40b8bcb9825f432fa8fbb5e79a5e9d50 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Wed, 7 Nov 2018 12:21:26 -0800 Subject: [PATCH 42/50] created test for making a rental with invalid data --- app/controllers/rentals_controller.rb | 4 ++-- test/controllers/rentals_controller_test.rb | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index bf8e4ce51..537cb109c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -37,13 +37,13 @@ def checkin rental.update(checkin: Date.today) render json: { id: rental.id } else - render json: { errors: { rental_id: ["No such rental"] } }, status: :bad_request - end end + + private def rental_params diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 40c228ead..58307aa93 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -86,6 +86,25 @@ end + it "does not check out a movie if data is invalid" do + + rental_data = { + rental: { + movie_id: Movie.first.id, + customer_id: Customer.first.id + } + } + + Rental.new(rental_data[:rental]).wont_be :valid?, "Book data wasn't invalid. Please come fix this test" + + expect { + post(checkout_path, params: rental_data) + }.wont_change('Rental.count') + + must_respond_with :bad_request + + end + end From 9c1f466f0eb1e5452d0a981461cad86bf971535d Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Wed, 7 Nov 2018 12:21:32 -0800 Subject: [PATCH 43/50] added negative test to rental checkin --- test/controllers/rentals_controller_test.rb | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 40c228ead..46eb7b445 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -79,7 +79,6 @@ expect(body).must_be_kind_of Hash expect(body).must_include "id" - rental = Rental.find(body["id"].to_i) must_respond_with :success @@ -90,6 +89,25 @@ end describe "checkin" do + it "can successfully update a rental with today's data as the checkin date" do + rental = Rental.first + # if the checking date is hardcoded like below, it works. Otherwise, checkin date is nil?!!? + # rental.checkin = Date.today + + patch checkin_path(rental) + must_respond_with :success + + # binding.pry + expect(rental.checkin).must_equal Date.today + end + + + it "responds with bad_request if no rental is found" do + rental = Rental.last + patch checkin_path(rental.id + 1) + must_respond_with :bad_request + end + end end From 7b05b3dfbc4fdcb7751bb845c4337b5e9df82a7b Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Wed, 7 Nov 2018 14:14:52 -0800 Subject: [PATCH 44/50] change to the checkout controller test. --- app/controllers/rentals_controller.rb | 1 + test/controllers/rentals_controller_test.rb | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 537cb109c..dec8f894c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -24,6 +24,7 @@ def checkout if rental.save render json: { id: rental.id } else + # Need to return error message here, per Dan request render json: {}, status: :bad_request end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 55edbe83c..4a831c02b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -63,8 +63,8 @@ let (:rental_params) { { - movie_id: 3, - customer_id: 4, + movie_id: Movie.first.id, + customer_id: Customer.first.id, checkout: "2016-11-11" } } @@ -110,6 +110,8 @@ describe "checkin" do it "can successfully update a rental with today's data as the checkin date" do rental = Rental.first + rental.checkout = "2016-11-11" + # if the checking date is hardcoded like below, it works. Otherwise, checkin date is nil?!!? # rental.checkin = Date.today From 1ce33b8bafbbf8b21afc4babd64ae4ba42b40adb Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Fri, 9 Nov 2018 14:20:31 -0800 Subject: [PATCH 45/50] fixed one rentals controller test. --- app/controllers/rentals_controller.rb | 6 ++++-- test/controllers/rentals_controller_test.rb | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index dec8f894c..eabf1b070 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -21,11 +21,13 @@ def show def checkout rental = Rental.new(rental_params) + rental_id = rental.id if rental.save render json: { id: rental.id } else # Need to return error message here, per Dan request - render json: {}, status: :bad_request + # render json: {}, status: :bad_request + render json: { errors: { rental_id: ["No such rental"] } }, status: :bad_request end end @@ -33,7 +35,7 @@ def checkout def checkin rental_id = params[:id] rental = Rental.find_by(id: rental_id) - + # binding.pry if rental rental.update(checkin: Date.today) render json: { id: rental.id } diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4a831c02b..9c7da0267 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -108,9 +108,9 @@ end describe "checkin" do - it "can successfully update a rental with today's data as the checkin date" do - rental = Rental.first - rental.checkout = "2016-11-11" + it "can successfully update a rental with today's date as the checkin date" do + rental = rentals(:one) + # rental.checkout = "2016-11-11" # if the checking date is hardcoded like below, it works. Otherwise, checkin date is nil?!!? # rental.checkin = Date.today From 90e3b7a8f9bcb885a9e952c0fe250f9bdfc8539d Mon Sep 17 00:00:00 2001 From: Carly Reiter Date: Fri, 9 Nov 2018 14:41:04 -0800 Subject: [PATCH 46/50] updated rental yml files with checkout date. --- test/controllers/rentals_controller_test.rb | 6 +++--- test/fixtures/rentals.yml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9c7da0267..a25f111a6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -109,13 +109,13 @@ describe "checkin" do it "can successfully update a rental with today's date as the checkin date" do - rental = rentals(:one) - # rental.checkout = "2016-11-11" + rental = Rental.first + # if the checking date is hardcoded like below, it works. Otherwise, checkin date is nil?!!? # rental.checkin = Date.today - patch checkin_path(rental) + patch checkin_path(rental.id) must_respond_with :success # binding.pry diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 9a8ba7578..25e982491 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -7,7 +7,9 @@ one: movie: dragon customer: harry + checkout: "2001-11-11" two: movie: drama customer: sally + checkout: "2001-11-11" From bb00a63f56171646c82f2720a345f427885dd985 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Fri, 9 Nov 2018 15:27:18 -0800 Subject: [PATCH 47/50] added 200 status for rental checkout --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 9 +++------ db/migrate/20181109224053_add_column_to_movies.rb | 5 +++++ ...0181109224508_reference_inventory_in_movies_column.rb | 5 +++++ db/migrate/20181109225530_add_column.rb | 5 +++++ db/migrate/20181109230118_remove_column.rb | 6 ++++++ db/schema.rb | 2 +- 7 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20181109224053_add_column_to_movies.rb create mode 100644 db/migrate/20181109224508_reference_inventory_in_movies_column.rb create mode 100644 db/migrate/20181109225530_add_column.rb create mode 100644 db/migrate/20181109230118_remove_column.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 237fdabfe..07584f0de 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,7 +10,7 @@ def index def create movie = Movie.new(movie_params) if movie.save - render json: { id: movie.id, title: movie.title } + render json: { id: movie.id }, status: :ok else # render_error(:bad_request, movie.errors.messages ) render json: {}, status: :bad_request diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index eabf1b070..73207504b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -21,13 +21,10 @@ def show def checkout rental = Rental.new(rental_params) - rental_id = rental.id if rental.save - render json: { id: rental.id } + render json: { id: rental.id }, status: :ok else - # Need to return error message here, per Dan request - # render json: {}, status: :bad_request - render json: { errors: { rental_id: ["No such rental"] } }, status: :bad_request + render json: {}, status: :bad_request end end @@ -35,7 +32,7 @@ def checkout def checkin rental_id = params[:id] rental = Rental.find_by(id: rental_id) - # binding.pry + if rental rental.update(checkin: Date.today) render json: { id: rental.id } diff --git a/db/migrate/20181109224053_add_column_to_movies.rb b/db/migrate/20181109224053_add_column_to_movies.rb new file mode 100644 index 000000000..6ee5d49b4 --- /dev/null +++ b/db/migrate/20181109224053_add_column_to_movies.rb @@ -0,0 +1,5 @@ +class AddColumnToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer, :default => 0 + end +end diff --git a/db/migrate/20181109224508_reference_inventory_in_movies_column.rb b/db/migrate/20181109224508_reference_inventory_in_movies_column.rb new file mode 100644 index 000000000..07ce3f63d --- /dev/null +++ b/db/migrate/20181109224508_reference_inventory_in_movies_column.rb @@ -0,0 +1,5 @@ +class ReferenceInventoryInMoviesColumn < ActiveRecord::Migration[5.2] + def change + remove_column :movies, :available_inventory + end +end diff --git a/db/migrate/20181109225530_add_column.rb b/db/migrate/20181109225530_add_column.rb new file mode 100644 index 000000000..d7bb5adf4 --- /dev/null +++ b/db/migrate/20181109225530_add_column.rb @@ -0,0 +1,5 @@ +class AddColumn < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/migrate/20181109230118_remove_column.rb b/db/migrate/20181109230118_remove_column.rb new file mode 100644 index 000000000..01362f64b --- /dev/null +++ b/db/migrate/20181109230118_remove_column.rb @@ -0,0 +1,6 @@ +class RemoveColumn < ActiveRecord::Migration[5.2] + def change + remove_column :movies, :available_inventory + + end +end diff --git a/db/schema.rb b/db/schema.rb index 7dbf42b29..e54cdbb80 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: 2018_11_07_183241) do +ActiveRecord::Schema.define(version: 2018_11_09_230118) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From 0b8db759a9b2f11f3490bc6ddc82abd8c93cb03c Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Fri, 9 Nov 2018 15:32:01 -0800 Subject: [PATCH 48/50] updated migration with default available inventory --- db/migrate/20181109232809_add_another_column.rb | 5 +++++ .../20181109232917_update_available_inventory_column.rb | 5 +++++ db/migrate/20181109233033_updates_to_inventory_column.rb | 5 +++++ db/schema.rb | 3 ++- 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181109232809_add_another_column.rb create mode 100644 db/migrate/20181109232917_update_available_inventory_column.rb create mode 100644 db/migrate/20181109233033_updates_to_inventory_column.rb diff --git a/db/migrate/20181109232809_add_another_column.rb b/db/migrate/20181109232809_add_another_column.rb new file mode 100644 index 000000000..23ae76019 --- /dev/null +++ b/db/migrate/20181109232809_add_another_column.rb @@ -0,0 +1,5 @@ +class AddAnotherColumn < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer, :default => 10 + end +end diff --git a/db/migrate/20181109232917_update_available_inventory_column.rb b/db/migrate/20181109232917_update_available_inventory_column.rb new file mode 100644 index 000000000..7abef9611 --- /dev/null +++ b/db/migrate/20181109232917_update_available_inventory_column.rb @@ -0,0 +1,5 @@ +class UpdateAvailableInventoryColumn < ActiveRecord::Migration[5.2] + def change + change_column :movies, :available_inventory, :integer + end +end diff --git a/db/migrate/20181109233033_updates_to_inventory_column.rb b/db/migrate/20181109233033_updates_to_inventory_column.rb new file mode 100644 index 000000000..6790f893c --- /dev/null +++ b/db/migrate/20181109233033_updates_to_inventory_column.rb @@ -0,0 +1,5 @@ +class UpdatesToInventoryColumn < ActiveRecord::Migration[5.2] + def change + change_column :movies, :available_inventory, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index e54cdbb80..eafa685bb 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: 2018_11_09_230118) do +ActiveRecord::Schema.define(version: 2018_11_09_233033) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.string "overview" t.date "release_date" t.integer "inventory" + t.integer "available_inventory", default: 0 end create_table "rentals", force: :cascade do |t| From 13eededc245691f22e5f1be0bc2af4e3eafafff5 Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Fri, 9 Nov 2018 15:37:27 -0800 Subject: [PATCH 49/50] added status codes to final two methods --- app/controllers/rentals_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 73207504b..d508409ca 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -24,7 +24,7 @@ def checkout if rental.save render json: { id: rental.id }, status: :ok else - render json: {}, status: :bad_request + render json: { errors: { rental: ["No such rental"] } }, status: :bad_request end end @@ -35,7 +35,7 @@ def checkin if rental rental.update(checkin: Date.today) - render json: { id: rental.id } + render json: { id: rental.id }, status: :ok else render json: { errors: { rental_id: ["No such rental"] } }, status: :bad_request end From d45b016cb94d74cc29c5086a1d6d90370719de9c Mon Sep 17 00:00:00 2001 From: Lindsay Terchin Date: Fri, 9 Nov 2018 15:39:16 -0800 Subject: [PATCH 50/50] removed unnecessary comments in code --- app/controllers/customers_controller.rb | 1 - app/controllers/movies_controller.rb | 1 - test/controllers/rentals_controller_test.rb | 1 - 3 files changed, 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index caf18ee2c..65ea4d162 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - # render json: jsonify(customers), status: :ok render json: jsonify(customers) end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 07584f0de..ef3019b83 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -12,7 +12,6 @@ def create if movie.save render json: { id: movie.id }, status: :ok else - # render_error(:bad_request, movie.errors.messages ) render json: {}, status: :bad_request end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a25f111a6..645ef4358 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -118,7 +118,6 @@ patch checkin_path(rental.id) must_respond_with :success - # binding.pry expect(rental.checkin).must_equal Date.today end