From 495691d4a89145bb6fc73d864b6dbb3b55369491 Mon Sep 17 00:00:00 2001 From: Angela Date: Tue, 14 May 2019 11:23:18 -0700 Subject: [PATCH 01/27] rails 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/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + 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 | 25 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 936 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..87d307d81 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.17.3 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..5d32244e9 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +NLyewCmPkkmqsDrXdre+aTNXWBf6XA3rnJLhc6z1vXX5nxN5jhq5eKOKaQr6bCs1qYVZ2WLsyYDhFyhBnQdqVFklob6lXUXqLw5vtcSnPUQoSbAANoPrZ5PpJbkvVatNQnO/Mka3OZjrGWFtFcecbQfgyrAMUFltmShai21zLIRhUI+Kf7NTqKuj8hQJatfV6+kdjLjtXpiEf8ljAoRJpEZ+O70wJ0WWn1KgQen2q5zt5A1SA3QV8ZiJ+ucfMRJqSB0ZTwa+sAVanmZe4o0WjtI1XMqwXa6IJY21zXqsqGvJ+9E6IPez5GV9CRyHeF3G31tQYtbqp0kgAPeULPQlM+PU15QOJ7a6abJmcddMoKL1Ef1aVWhimm3W3r/YyCyTEvHGVrgd49IKs3pbfV8etCCBb4/MY5THJmpf--2kFI3m+jm4DAUBv3--FtkisuBRoPfd7CDG+rQCTg== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/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..fb7dd505e --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +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 6fb1679db884a2734066d6a975cf4d7feb0ea385 Mon Sep 17 00:00:00 2001 From: Angela Date: Tue, 14 May 2019 12:48:00 -0700 Subject: [PATCH 02/27] pseudocode routes for customers and movies --- config/routes.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..7082a6547 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,16 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + # get "/movies", to: movies#index + # get "/movies/:id", to: movies#show + # post "/movies", to: movies#create + # post "/movies/:id", to: movies#update + # get "/movies/:id, to: movies#destroy + + # get "/customers", to: customers#index + # get "/customers/:id", to: customers#show + # post "/customers", to: customers#create + # post "/customers/:id", to: customers#update + # get "/customers/:id, to: customers#destroy + end From b43ccf3c2e616fda4ad9ad997259a4f01f2e0f11 Mon Sep 17 00:00:00 2001 From: Angela Date: Tue, 14 May 2019 13:25:18 -0700 Subject: [PATCH 03/27] created model for movie and customer --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + config/routes.rb | 17 ++++---- db/migrate/20190514202325_create_movies.rb | 12 ++++++ db/migrate/20190514202430_create_customers.rb | 15 +++++++ db/schema.rb | 39 +++++++++++++++++++ test/fixtures/customers.yml | 19 +++++++++ test/fixtures/movies.yml | 13 +++++++ test/models/customer_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ 10 files changed, 128 insertions(+), 9 deletions(-) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20190514202325_create_movies.rb create mode 100644 db/migrate/20190514202430_create_customers.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..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/config/routes.rb b/config/routes.rb index 7082a6547..43423faa5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,16 +1,15 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - # get "/movies", to: movies#index - # get "/movies/:id", to: movies#show - # post "/movies", to: movies#create - # post "/movies/:id", to: movies#update - # get "/movies/:id, to: movies#destroy + # resources: :movies, only: [:index, :show, :create] + ### get "/movies", to: movies#index + ### get "/movies/:id", to: movies#show + ### post "/movies", to: movies#create # get "/customers", to: customers#index - # get "/customers/:id", to: customers#show - # post "/customers", to: customers#create - # post "/customers/:id", to: customers#update - # get "/customers/:id, to: customers#destroy + + # Which controller do these routes route to? + # post "/rentals/check-out", to: + # post "/rentals/check-in", to: end diff --git a/db/migrate/20190514202325_create_movies.rb b/db/migrate/20190514202325_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514202325_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20190514202430_create_customers.rb b/db/migrate/20190514202430_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514202430_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..187e57e09 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_202430) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..75d6b410a --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2019-05-14 13:24:30 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 13:24:30 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e8afe187d --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From ff0a148044c7a5322da85df9ac70a8c598897c72 Mon Sep 17 00:00:00 2001 From: Angela Date: Tue, 14 May 2019 13:31:38 -0700 Subject: [PATCH 04/27] added rental model --- app/models/rental.rb | 2 ++ db/migrate/20190514203058_create_rentals.rb | 11 +++++++++++ db/schema.rb | 10 +++++++++- test/fixtures/rentals.yml | 11 +++++++++++ test/models/rental_test.rb | 9 +++++++++ 5 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514203058_create_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20190514203058_create_rentals.rb b/db/migrate/20190514203058_create_rentals.rb new file mode 100644 index 000000000..3f62fbcd4 --- /dev/null +++ b/db/migrate/20190514203058_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :checkout_date + t.string :due_date + t.string :date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 187e57e09..a7576be1b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_202430) do +ActiveRecord::Schema.define(version: 2019_05_14_203058) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,12 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.string "due_date" + t.string "date" + 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..bc47d9923 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: 2019-05-14 + due_date: MyString + date: MyString + +two: + checkout_date: 2019-05-14 + due_date: MyString + date: MyString 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 00d24f466e77bb7fee9bfab964c22453830776f1 Mon Sep 17 00:00:00 2001 From: Angela Date: Tue, 14 May 2019 13:44:53 -0700 Subject: [PATCH 05/27] created customer controller and added index action --- app/controllers/customers_controller.rb | 7 +++++++ config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..a1f07d4db --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,7 @@ +class CustomersController < ApplicationController + def index + customers = Customer.all + render json: { ok: true, customer: customers.as_json(only: [:id, :name, :register_at, :postal_code, :phone]) }, + status: :ok + end +end diff --git a/config/routes.rb b/config/routes.rb index 43423faa5..663dbc363 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,7 @@ ### get "/movies/:id", to: movies#show ### post "/movies", to: movies#create - # get "/customers", to: customers#index + get "/customers", to: "customers#index" # Which controller do these routes route to? # post "/rentals/check-out", to: diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 69185eb2368a1c959ba43b0b99f1d77db6653c11 Mon Sep 17 00:00:00 2001 From: Angela Date: Tue, 14 May 2019 13:53:42 -0700 Subject: [PATCH 06/27] passing index tests in customer#index --- app/controllers/customers_controller.rb | 3 +- config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 39 +++++++++++++++++-- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a1f07d4db..dfcbb1af5 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,8 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: { ok: true, customer: customers.as_json(only: [:id, :name, :register_at, :postal_code, :phone]) }, + # render json: { ok: true, customer: customers.as_json(only: [:id, :name, :register_at, :postal_code, :phone]) }, + render json: customers.as_json(only: [:id, :name, :phone, :postal_code, :registered_at]), status: :ok end end diff --git a/config/routes.rb b/config/routes.rb index 663dbc363..dc78a1b13 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,7 @@ ### get "/movies/:id", to: movies#show ### post "/movies", to: movies#create - get "/customers", to: "customers#index" + get "/customers", to: "customers#index", as: "customers" # Which controller do these routes route to? # post "/rentals/check-out", to: diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..2d52a8f5b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,40 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + # These tests are a little verbose - yours do not need to be + # this explicit. + it "is a real working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the pets" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns pets with exactly the required fields" do + keys = %w(id name phone postal_code registered_at) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end end From b02a716c1bcf403735cfcf29e75c4db9e3a57eba Mon Sep 17 00:00:00 2001 From: Angela Date: Tue, 14 May 2019 13:58:03 -0700 Subject: [PATCH 07/27] created movies controller --- app/controllers/movies_controller.rb | 2 ++ config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index dc78a1b13..785416c66 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - # resources: :movies, only: [:index, :show, :create] + resources :movies, only: [:index, :show, :create] ### get "/movies", to: movies#index ### get "/movies/:id", to: movies#show ### post "/movies", to: movies#create diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From fe324d00e62bd95d38abaaa060dbe60668a1f6af Mon Sep 17 00:00:00 2001 From: Angela Date: Tue, 14 May 2019 14:16:34 -0700 Subject: [PATCH 08/27] added test for movie#show --- app/controllers/movies_controller.rb | 10 +++++ test/controllers/movies_controller_test.rb | 43 ++++++++++++++++++++-- test/fixtures/movies.yml | 4 +- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..f6e54e3ab 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,12 @@ class MoviesController < ApplicationController + def show + movie = Movie.find_by(id: params[:id]) + if movie + render json: movie.as_json(only: [:id, :inventory, :overview, :release_date, :title]), + status: :ok + else + render json: { ok: false, errors: { movie: ["Movie not found"] } }, + status: :not_found + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..4080c7157 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,44 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "show" do + it "can get a movie" do + get movie_path(movies(:two).id) + must_respond_with :success + end + + it "returns correct movie" do + movie = movies(:two) + + get movie_path(movie.id) + + expect(movie.title).must_equal "MovieTwo" + end + + it "returns movie with exactly the required fields" do + movie = movies(:two) + + get movie_path(movie.id) + + 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[:title] + must_respond_with :success + end + + it "returns an error if movie does not exist" do + get movie_path(-1) + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "movie" + must_respond_with :not_found + end + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e8afe187d..fe4fbc373 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString + title: MovieOne overview: MyString release_date: 2019-05-14 inventory: 1 two: - title: MyString + title: MovieTwo overview: MyString release_date: 2019-05-14 inventory: 1 From f3cf8f2a72f1ccb00a2966214479e2a74771ac97 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Tue, 14 May 2019 14:16:48 -0700 Subject: [PATCH 09/27] added index for movie controller and corresponding tests --- app/controllers/movies_controller.rb | 14 +++++++ test/controllers/customers_controller_test.rb | 6 +-- test/controllers/movies_controller_test.rb | 37 +++++++++++++++++-- 3 files changed, 50 insertions(+), 7 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..913974155 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,16 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :release_date, :title]), status: :ok + end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie + render status: :ok, json: movie.as_json(only: [:inventory, :overview, :release_date, :title]) + else + render status: :not_found, json: {errors: ["The movie you are looking for cannot be found."]} + end + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2d52a8f5b..5eb0ef70c 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,8 +2,6 @@ describe CustomersController do describe "index" do - # These tests are a little verbose - yours do not need to be - # this explicit. it "is a real working route" do get customers_path must_respond_with :success @@ -21,14 +19,14 @@ body.must_be_kind_of Array end - it "returns all of the pets" do + it "returns all of the customers" do get customers_path body = JSON.parse(response.body) body.length.must_equal Customer.count end - it "returns pets with exactly the required fields" do + it "returns customers with exactly the required fields" do keys = %w(id name phone postal_code registered_at) get customers_path body = JSON.parse(response.body) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..60e893863 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,38 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + + it "returns json" do + get movies_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the pets" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns pets with exactly the required fields" do + keys = %w(id release_date title) + get movies_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end end From 9f08506568ff13abb821ea044b5371987e614bd1 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Tue, 14 May 2019 14:33:39 -0700 Subject: [PATCH 10/27] added controller action create for movie and corresponding tests --- app/controllers/movies_controller.rb | 16 +++++++++ app/models/movie.rb | 1 + config/routes.rb | 3 -- test/controllers/movies_controller_test.rb | 42 ++++++++++++++++++++++ test/models/movie_test.rb | 5 --- 5 files changed, 59 insertions(+), 8 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d572a70e7..861d0301c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,4 +14,20 @@ def show status: :not_found end end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: [:id, :inventory, :overview, :release_date, :title]), status: :ok + else + render json: {ok: false, errors: movie.errors.messages}, status: :bad_request + end + end + + private + + def movie_params + params.require(:movie).permit(:inventory, :overview, :release_date, :title) + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..ce2cdb507 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + validates :title, presence: :true end diff --git a/config/routes.rb b/config/routes.rb index 785416c66..86ce424dd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :movies, only: [:index, :show, :create] - ### get "/movies", to: movies#index - ### get "/movies/:id", to: movies#show - ### post "/movies", to: movies#create get "/customers", to: "customers#index", as: "customers" diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d0b4fa063..3a0e877ce 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -76,4 +76,46 @@ must_respond_with :not_found end end + + describe "create" do + let(:movie_data) { + { + title: "Pirates of the Caribbean", + inventory: 2, + overview: "The adventures of pirates", + release_date: "2003-06-28", + } + } + + 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 + # arrange + movie_data["title"] = nil + + expect { + post movies_path, params: {movie: movie_data} + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..2719f5fff 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,4 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } - - it "must be valid" do - value(movie).must_be :valid? - end end From e8e7ef14aa75694d9d0f42cf2f0fa053ac7f1d61 Mon Sep 17 00:00:00 2001 From: Angela Date: Tue, 14 May 2019 15:37:42 -0700 Subject: [PATCH 11/27] added checkout to movies controller and corresponding tests --- .DS_Store | Bin 0 -> 8196 bytes app/controllers/movies_controller.rb | 28 ++++++++++++--- app/models/customer.rb | 2 ++ app/models/movie.rb | 3 ++ app/models/rental.rb | 2 ++ config/routes.rb | 5 ++- db/migrate/20190514221527_add_foreign_keys.rb | 9 +++++ db/schema.rb | 8 ++++- test/controllers/movies_controller_test.rb | 33 ++++++++++++++++-- 9 files changed, 79 insertions(+), 11 deletions(-) create mode 100644 .DS_Store create mode 100644 db/migrate/20190514221527_add_foreign_keys.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ccdc41eb7351b4dd813e1259328cbac34365dc38 GIT binary patch literal 8196 zcmeI1!EVzq7{@<1rA;>wJ%F}j4j^%u&^ojsgeH};3GIM{D1rl^EosXZElsL6T?M76 z7ajs00EtK8#E}Q#0pS1HrXx-_L<^EoRzzhLdW#|S-a#lk`kPum zS5etX$eA&Yo>}M}iqKmR;Ym4(ri!+-1T29f0p7biIgYUw5oX>2&&8;%lnDKIqO4b3v;@} zc~{9dTvd7iPhYM(qMo7tYN#*f)tDi|S!1re&)GJ7HTcF@)ex&=LWP-#sej5)uRzs@ z;}EMGZU3wd^SuvtE%9N7=s{>*vZc;n0Qv}(qpXf7%M#WoFwb4 zz6Sj+-J>0Ph*8h>)%AlDPO2mU3bY{y0rANeUwbvsh^HVEr0l&j~@ByQK0Kjk|bKx{orZXo9x%G z+)v`v598iYn!|1nk{8dyxSLE`$vEzg@cUrLidX_Lp;k~wpe1Ob}b#oP^1%=#>BgzK>#Kk`hQTHHaPgBRaifBQyF9IY6 KTUY{rmB3GeQ$ElD literal 0 HcmV?d00001 diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 861d0301c..b52781d2b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,24 +10,42 @@ def show render json: movie.as_json(only: [:id, :inventory, :overview, :release_date, :title]), status: :ok else - render json: {ok: false, errors: {movie: ["Movie not found"]}}, + render json: { ok: false, errors: { movie: ["Movie not found"] } }, status: :not_found end end def create movie = Movie.new(movie_params) - - if movie.save + is_successful = movie.save + if is_successful render json: movie.as_json(only: [:id, :inventory, :overview, :release_date, :title]), status: :ok else - render json: {ok: false, errors: movie.errors.messages}, status: :bad_request + render json: { ok: false, errors: movie.errors.messages }, status: :bad_request + end + end + + def checkout + rental = Rental.new(rental_params) + rental.checkout_date = Date.today + rental.due_date = rental.checkout_date + 7.days + + is_successful = rental.save + if is_successful + render json: rental.as_json(only: [:due_date]), + status: :ok + else + render json: { ok: false, errors: rental.errors.messages }, status: :bad_request end end private def movie_params - params.require(:movie).permit(:inventory, :overview, :release_date, :title) + params.permit(:inventory, :overview, :release_date, :title) + end + + def rental_params + params.permit(:customer_id, :movie_id) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..53356748d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,4 @@ class Customer < ApplicationRecord + has_many :rentals + # has_many :movies, through: :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index ce2cdb507..cb6c50d33 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals + # has_many :customers, through: :rentals + validates :title, presence: :true end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..e001ff37c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie end diff --git a/config/routes.rb b/config/routes.rb index 86ce424dd..433d3a293 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,6 @@ get "/customers", to: "customers#index", as: "customers" # Which controller do these routes route to? - # post "/rentals/check-out", to: - # post "/rentals/check-in", to: - + post "/rentals/check-out", to: "movies#checkout", as: "checkout" + post "/rentals/check-in", to: "movies#checkin", as: "checkin" end diff --git a/db/migrate/20190514221527_add_foreign_keys.rb b/db/migrate/20190514221527_add_foreign_keys.rb new file mode 100644 index 000000000..075ab9776 --- /dev/null +++ b/db/migrate/20190514221527_add_foreign_keys.rb @@ -0,0 +1,9 @@ +class AddForeignKeys < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + + # add_reference :driver_passengers, :driver, foreign_key: true + + end +end diff --git a/db/schema.rb b/db/schema.rb index a7576be1b..36014e6dc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_203058) do +ActiveRecord::Schema.define(version: 2019_05_14_221527) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,6 +42,12 @@ t.string "date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3a0e877ce..525169b45 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -89,7 +89,7 @@ it "creates a new movie given valid data" do expect { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change "Movie.count", 1 body = JSON.parse(response.body) @@ -107,7 +107,7 @@ movie_data["title"] = nil expect { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.wont_change "Movie.count" body = JSON.parse(response.body) @@ -118,4 +118,33 @@ must_respond_with :bad_request end end + + describe "checkout" do + let(:rental_data) { + { + customer_id: Customer.first.id, + movie_id: Movie.first.id, + } + } + it "can rent a movie" do + expect { + post checkout_path(rental_data) + }.must_change "Rental.count", +1 + + new_rental = Rental.find_by(customer_id: Customer.first.id, movie_id: Movie.first.id) + # expect(new_rental.checkout_date).must_equal Date.today + # expect(new_rental.due_date).must_equal Date.today + 7.days + must_respond_with :success + end + + it "returns an error for with invalid data" do + rental_data[:customer_id] = nil + + expect { + post checkout_path(rental_data) + }.wont_change "Rental.count" + + must_respond_with :bad_request + end + end end From f48076a3ead2a0e0188aff27d509bf5e3c6be2ed Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Tue, 14 May 2019 15:59:15 -0700 Subject: [PATCH 12/27] wrote tests for checkin and corresponding controller action --- app/controllers/movies_controller.rb | 27 +++++++++++++--- ...13_add_currently_checked_out_to_rentals.rb | 5 +++ db/schema.rb | 3 +- test/controllers/movies_controller_test.rb | 31 +++++++++++++++++++ test/models/rental_test.rb | 5 --- 5 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 db/migrate/20190514224413_add_currently_checked_out_to_rentals.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b52781d2b..f4d6a06ca 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,7 +10,7 @@ def show render json: movie.as_json(only: [:id, :inventory, :overview, :release_date, :title]), status: :ok else - render json: { ok: false, errors: { movie: ["Movie not found"] } }, + render json: {ok: false, errors: {movie: ["Movie not found"]}}, status: :not_found end end @@ -21,7 +21,7 @@ def create if is_successful render json: movie.as_json(only: [:id, :inventory, :overview, :release_date, :title]), status: :ok else - render json: { ok: false, errors: movie.errors.messages }, status: :bad_request + render json: {ok: false, errors: movie.errors.messages}, status: :bad_request end end @@ -29,13 +29,30 @@ def checkout rental = Rental.new(rental_params) rental.checkout_date = Date.today rental.due_date = rental.checkout_date + 7.days + rental.currently_checked_out = true is_successful = rental.save if is_successful - render json: rental.as_json(only: [:due_date]), - status: :ok + render json: rental.as_json(only: [:due_date]), status: :ok + else + render json: {ok: false, errors: rental.errors.messages}, status: :bad_request + end + end + + def checkin + rental = Rental.find_by(movie_id: rental_params[:movie_id], customer_id: rental_params[:customer_id]) + if rental + rental.currently_checked_out = false + + is_successful = rental.save + + if is_successful + render json: {ok: true, message: "successfully checked in!"}, status: :ok + else + render json: {ok: false, errors: rental.errors.messages}, status: :bad_request + end else - render json: { ok: false, errors: rental.errors.messages }, status: :bad_request + render json: {ok: false, errors: {rental: ["Rental not found"]}}, status: :not_found end end diff --git a/db/migrate/20190514224413_add_currently_checked_out_to_rentals.rb b/db/migrate/20190514224413_add_currently_checked_out_to_rentals.rb new file mode 100644 index 000000000..19eedf10a --- /dev/null +++ b/db/migrate/20190514224413_add_currently_checked_out_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCurrentlyCheckedOutToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :currently_checked_out, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index 36014e6dc..21297f867 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_221527) do +ActiveRecord::Schema.define(version: 2019_05_14_224413) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -44,6 +44,7 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" + t.boolean "currently_checked_out" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 525169b45..b7458116f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -126,6 +126,7 @@ movie_id: Movie.first.id, } } + it "can rent a movie" do expect { post checkout_path(rental_data) @@ -147,4 +148,34 @@ must_respond_with :bad_request end end + + describe "checkin" do + let(:rental_data) { + { + customer_id: Customer.first.id, + movie_id: Movie.first.id, + } + } + + it "returns a 200 ok for successfully checked in rentals" do + #checkout so that we can checkin + expect { + post checkout_path(rental_data) + }.must_change "Rental.count", +1 + + expect { + post checkin_path(rental_data) + }.wont_change "Rental.count" + + must_respond_with :success + end + + it "returns not found for not found rental" do + expect { + post checkin_path(rental_data) + }.wont_change "Rental.count" + + must_respond_with :not_found + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..262a8e12e 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,4 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } - - it "must be valid" do - value(rental).must_be :valid? - end end From 325d057042157c8514e77d45a203b31961128885 Mon Sep 17 00:00:00 2001 From: Angela Date: Tue, 14 May 2019 17:06:10 -0700 Subject: [PATCH 13/27] added customer model test for validation (name) and relationships --- app/models/customer.rb | 4 +++- app/models/movie.rb | 2 +- test/fixtures/customers.yml | 24 +++++++++++------------ test/fixtures/rentals.yml | 9 +++++++++ test/models/customer_test.rb | 38 ++++++++++++++++++++++++++++++++++-- 5 files changed, 61 insertions(+), 16 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 53356748d..7ad158446 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,6 @@ class Customer < ApplicationRecord has_many :rentals - # has_many :movies, through: :rentals + has_many :movies, through: :rentals + + validates :name, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index cb6c50d33..c0d3e9a5c 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord has_many :rentals - # has_many :customers, through: :rentals + has_many :customers, through: :rentals validates :title, presence: :true end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 75d6b410a..be79b72de 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: Angela registered_at: 2019-05-14 13:24:30 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: abc street + city: seattle + state: washington + postal_code: bbb + phone: aaa two: - name: MyString + name: Erica registered_at: 2019-05-14 13:24:30 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: def street + city: seattle + state: washington + postal_code: ccc + phone: ddd diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index bc47d9923..56a5ccebd 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -9,3 +9,12 @@ two: checkout_date: 2019-05-14 due_date: MyString date: MyString + +three: + checkout_date: 2019-05-14 + due_date: MyString + date: MyString + customer_id: 1 + movie_id: 2 + + diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..57f14dce0 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,43 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { Customer.new(name: "meee") } it "must be valid" do - value(customer).must_be :valid? + value(customer.valid?).must_equal true + end + + describe "relations" do + let(:customer_one) { customers(:one) } + it "can have one or many rentals" do + test_rental = rentals(:one) + other_rental = rentals(:two) + + customer.rentals << test_rental + customer_one.rentals << other_rental + + expect(test_rental.customer).must_equal customer + expect(other_rental.customer).must_equal customer_one + end + + it "can have one or many movies through rentals" do + new_movie = Movie.create(title: "happy days", overview: "lalala", release_date: Date.today, inventory: 12) + customer_one.movies << new_movie + + expect(new_movie.customers).must_include customer_one + end + end + + describe "validations" do + it "requires a name" do + customer.name = nil + valid_customer = customer.valid? + + expect(valid_customer).must_equal false + expect(customer.errors.messages).must_include :name + end + end + + describe "custome methods" do end end From 9dd3b6fcbc61c1a3182159115c898ef9610864b3 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Wed, 15 May 2019 11:42:02 -0700 Subject: [PATCH 14/27] added readline gem to be able to open rails c --- Gemfile | 2 ++ Gemfile.lock | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 687a6f632..0a4fbcccd 100644 --- a/Gemfile +++ b/Gemfile @@ -38,6 +38,8 @@ group :development do # 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' + # Adding this for a readline issue that prevents rails console from opening + gem 'rb-readline' end diff --git a/Gemfile.lock b/Gemfile.lock index 87d307d81..84436358c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,6 +123,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) + rb-readline (0.5.5) ruby-progressbar (1.10.0) ruby_dep (1.5.0) spring (2.0.2) @@ -158,6 +159,7 @@ DEPENDENCIES pry-rails puma (~> 3.11) rails (~> 5.2.3) + rb-readline spring spring-watcher-listen (~> 2.0.0) tzinfo-data From 3c2b8b6abffd20c08f5f3bcc903e6c8dc1ee8927 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Wed, 15 May 2019 11:42:33 -0700 Subject: [PATCH 15/27] updated checkout to include call rental method that prepares for checkout --- app/controllers/movies_controller.rb | 6 ++---- app/models/rental.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f4d6a06ca..a2cb6e3d8 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -27,11 +27,9 @@ def create def checkout rental = Rental.new(rental_params) - rental.checkout_date = Date.today - rental.due_date = rental.checkout_date + 7.days - rental.currently_checked_out = true - is_successful = rental.save + is_successful = rental.prepare_for_checkout + if is_successful render json: rental.as_json(only: [:due_date]), status: :ok else diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..894649ace 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,12 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + + def prepare_for_checkout + self.checkout_date = Date.today + self.due_date = self.checkout_date + 7.days + self.currently_checked_out = true + + self.save + end end From a45c4b06198966dc126f038fa66196965eae21b7 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Wed, 15 May 2019 12:14:37 -0700 Subject: [PATCH 16/27] wrote model tests for rental --- app/models/rental.rb | 5 +- test/controllers/movies_controller_test.rb | 4 +- test/models/customer_test.rb | 2 +- test/models/rental_test.rb | 53 ++++++++++++++++++++++ 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 894649ace..b5d357bcb 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,11 +2,14 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + validates :movie_id, presence: true + validates :customer_id, presence: true + def prepare_for_checkout self.checkout_date = Date.today self.due_date = self.checkout_date + 7.days self.currently_checked_out = true - self.save + return self.save end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b7458116f..09c0f3747 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -19,14 +19,14 @@ body.must_be_kind_of Array end - it "returns all of the pets" do + it "returns all of the movies" do get movies_path body = JSON.parse(response.body) body.length.must_equal Customer.count end - it "returns pets with exactly the required fields" do + it "returns movies with exactly the required fields" do keys = %w(id release_date title) get movies_path body = JSON.parse(response.body) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 57f14dce0..fbeb1142f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -38,6 +38,6 @@ end end - describe "custome methods" do + describe "custom methods" do end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 262a8e12e..8aaf0502b 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,4 +1,57 @@ require "test_helper" describe Rental do + before do + @movie = Movie.first + @customer = Customer.first + @rental = Rental.create(movie_id: @movie.id, customer_id: @customer.id) + end + + describe "validations" do + it "requires a customer_id" do + @rental.customer_id = nil + valid_rental = @rental.valid? + + expect(valid_rental).must_equal false + expect(@rental.errors.messages).must_include :customer_id + end + + it "requires a movie_id" do + @rental.movie_id = nil + valid_rental = @rental.valid? + + expect(valid_rental).must_equal false + expect(@rental.errors.messages).must_include :movie_id + end + end + + describe "relationships" do + it "belongs to a customer" do + expect(@rental.customer).must_equal @customer + expect(@customer.rentals).must_include @rental + end + + it "belongs to a movie" do + expect(@rental.movie).must_equal @movie + expect(@movie.rentals).must_include @rental + end + end + + describe "custom methods" do + describe "prepare_for_checkout" do + it "sets the required fields and returns true" do + expect(@rental.prepare_for_checkout).must_equal true + + expect(@rental.checkout_date).must_equal Date.today + # expect(@rental.due_date).must_equal (Date.today + 7.days) UNCOMMENT AFTER FIXING DATATYPE THROUGH MIGRATION + expect(@rental.currently_checked_out).must_equal true + end + + it "returns false if unable to save" do + bad_rental = Rental.new + + expect(bad_rental.prepare_for_checkout).must_equal false + end + end + end end From 7a5e2dfbff9ae3179ed267cc1afb639795e8bef7 Mon Sep 17 00:00:00 2001 From: Angela Date: Wed, 15 May 2019 12:59:29 -0700 Subject: [PATCH 17/27] added available_inventory in movie.rb and movies#show --- app/controllers/movies_controller.rb | 14 +++++++------- app/models/movie.rb | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a2cb6e3d8..75ec6f264 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,10 +7,10 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:id, :inventory, :overview, :release_date, :title]), + render json: movie.as_json(only: [:id, :inventory, :overview, :release_date, :title], methods: [:available_inventory]), status: :ok else - render json: {ok: false, errors: {movie: ["Movie not found"]}}, + render json: { ok: false, errors: { movie: ["Movie not found"] } }, status: :not_found end end @@ -21,7 +21,7 @@ def create if is_successful render json: movie.as_json(only: [:id, :inventory, :overview, :release_date, :title]), status: :ok else - render json: {ok: false, errors: movie.errors.messages}, status: :bad_request + render json: { ok: false, errors: movie.errors.messages }, status: :bad_request end end @@ -33,7 +33,7 @@ def checkout if is_successful render json: rental.as_json(only: [:due_date]), status: :ok else - render json: {ok: false, errors: rental.errors.messages}, status: :bad_request + render json: { ok: false, errors: rental.errors.messages }, status: :bad_request end end @@ -45,12 +45,12 @@ def checkin is_successful = rental.save if is_successful - render json: {ok: true, message: "successfully checked in!"}, status: :ok + render json: { ok: true, message: "successfully checked in!" }, status: :ok else - render json: {ok: false, errors: rental.errors.messages}, status: :bad_request + render json: { ok: false, errors: rental.errors.messages }, status: :bad_request end else - render json: {ok: false, errors: {rental: ["Rental not found"]}}, status: :not_found + render json: { ok: false, errors: { rental: ["Rental not found"] } }, status: :not_found end end diff --git a/app/models/movie.rb b/app/models/movie.rb index c0d3e9a5c..86ebde580 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,8 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals validates :title, presence: :true + + def available_inventory + return self.inventory + end end From c4215642dbe1943c271674c86b3808006e6a28c9 Mon Sep 17 00:00:00 2001 From: Angela Date: Wed, 15 May 2019 13:01:24 -0700 Subject: [PATCH 18/27] added movies_checked_out_count in customer.rb and customers#index --- app/controllers/customers_controller.rb | 2 +- app/models/customer.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index dfcbb1af5..160830d1f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all # render json: { ok: true, customer: customers.as_json(only: [:id, :name, :register_at, :postal_code, :phone]) }, - render json: customers.as_json(only: [:id, :name, :phone, :postal_code, :registered_at]), + render json: customers.as_json(only: [:id, :name, :phone, :postal_code, :registered_at], methods: [:movies_checked_out_count]), status: :ok end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 7ad158446..eca47cec2 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,4 +3,8 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals validates :name, presence: true + + def movies_checked_out_count + return 0 # This should be zero until we the optional steps + end end From 5d53ba1e98295fb8b0c2b237c8cb304256f8ee57 Mon Sep 17 00:00:00 2001 From: Angela Date: Wed, 15 May 2019 13:05:38 -0700 Subject: [PATCH 19/27] added test for new field in customers controller --- test/controllers/customers_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5eb0ef70c..582ecae0b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,7 +27,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(id name phone postal_code registered_at) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) get customers_path body = JSON.parse(response.body) body.each do |customer| From 42e071cddef19c875c9eb38c47b656ee314ba080 Mon Sep 17 00:00:00 2001 From: Angela Date: Wed, 15 May 2019 13:13:06 -0700 Subject: [PATCH 20/27] added customer model and movie model test --- test/models/customer_test.rb | 3 +++ test/models/movie_test.rb | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index fbeb1142f..0d9a13bfb 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -39,5 +39,8 @@ end describe "custom methods" do + it "returns a value for movies_checked_out_count" do + expect(customer.movies_checked_out_count).must_equal 0 + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 2719f5fff..a730ab18d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,4 +1,10 @@ require "test_helper" describe Movie do + describe "custom methods" do + let(:movie) { Movie.first } + it "will return a value for movies_checked out" do + expect(movie.available_inventory).must_equal movie.inventory + end + end end From a8d205d556147bfcf7ae1836a8ae502f7118c1b8 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Wed, 15 May 2019 13:18:57 -0700 Subject: [PATCH 21/27] migrations to fix rentals schema --- .../20190515201433_remove_date_and_due_date_from_rental.rb | 6 ++++++ db/migrate/20190515201728_add_due_date_to_rentals.rb | 5 +++++ db/schema.rb | 5 ++--- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20190515201433_remove_date_and_due_date_from_rental.rb create mode 100644 db/migrate/20190515201728_add_due_date_to_rentals.rb diff --git a/db/migrate/20190515201433_remove_date_and_due_date_from_rental.rb b/db/migrate/20190515201433_remove_date_and_due_date_from_rental.rb new file mode 100644 index 000000000..a497f199f --- /dev/null +++ b/db/migrate/20190515201433_remove_date_and_due_date_from_rental.rb @@ -0,0 +1,6 @@ +class RemoveDateAndDueDateFromRental < ActiveRecord::Migration[5.2] + def change + remove_column :rentals, :due_date + remove_column :rentals, :date + end +end diff --git a/db/migrate/20190515201728_add_due_date_to_rentals.rb b/db/migrate/20190515201728_add_due_date_to_rentals.rb new file mode 100644 index 000000000..61af77fc2 --- /dev/null +++ b/db/migrate/20190515201728_add_due_date_to_rentals.rb @@ -0,0 +1,5 @@ +class AddDueDateToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :due_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 21297f867..9c8689d6a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_224413) do +ActiveRecord::Schema.define(version: 2019_05_15_201728) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,13 +38,12 @@ create_table "rentals", force: :cascade do |t| t.date "checkout_date" - t.string "due_date" - t.string "date" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" t.boolean "currently_checked_out" + t.date "due_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From fecfb7057dbf63c5059a6255751341ebdd14d2da Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Wed, 15 May 2019 13:23:03 -0700 Subject: [PATCH 22/27] updated fixture data to match new schema --- test/fixtures/rentals.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 56a5ccebd..cf73e8ddf 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -2,19 +2,8 @@ one: checkout_date: 2019-05-14 - due_date: MyString - date: MyString + due_date: 2019-05-21 two: checkout_date: 2019-05-14 - due_date: MyString - date: MyString - -three: - checkout_date: 2019-05-14 - due_date: MyString - date: MyString - customer_id: 1 - movie_id: 2 - - + due_date: 2019-05-21 \ No newline at end of file From 2e28192850ec9219ef45ac755a63009eef28f23e Mon Sep 17 00:00:00 2001 From: Angela Date: Wed, 15 May 2019 13:31:35 -0700 Subject: [PATCH 23/27] added movie relationship tests --- test/models/movie_test.rb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index a730ab18d..6c9892ed3 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,6 +1,33 @@ require "test_helper" describe Movie do + let(:movie) { Movie.new(title: "meee") } + + it "must be valid" do + value(movie.valid?).must_equal true + end + + describe "relations" do + let(:movie_one) { Movie.first } + it "can have one or many rentals" do + test_rental = rentals(:one) + other_rental = rentals(:two) + + movie.rentals << test_rental + movie_one.rentals << other_rental + + expect(test_rental.movie).must_equal movie + expect(other_rental.movie).must_equal movie_one + end + + it "can have one or many customers through rentals" do + new_customer = Customer.create(name: "happy days") + movie_one.customers << new_customer + + expect(new_customer.movies).must_include movie_one + end + end + describe "custom methods" do let(:movie) { Movie.first } it "will return a value for movies_checked out" do From e4c68a517bd68ea960928d7f4a20d17f57532e8a Mon Sep 17 00:00:00 2001 From: Angela Date: Wed, 15 May 2019 13:33:34 -0700 Subject: [PATCH 24/27] movie.rb test for vaidation --- test/models/movie_test.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 6c9892ed3..341a62c3f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -28,6 +28,16 @@ end end + describe "validation" do + it "requires a title" do + movie.title = nil + valid_movie = movie.valid? + + expect(valid_movie).must_equal false + expect(movie.errors.messages).must_include :title + end + end + describe "custom methods" do let(:movie) { Movie.first } it "will return a value for movies_checked out" do From 34bde2c800b47479f247097dd82c6241663f3fdc Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Wed, 15 May 2019 13:57:49 -0700 Subject: [PATCH 25/27] updated method and test for available_inventory to take into account checked out movies --- app/models/movie.rb | 4 +++- test/models/movie_test.rb | 18 +++++++++++++++--- test/models/rental_test.rb | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 86ebde580..85f7f406f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,6 +5,8 @@ class Movie < ApplicationRecord validates :title, presence: :true def available_inventory - return self.inventory + current_rentals = Rental.where(movie_id: self.id, currently_checked_out: true) + avail_inventory = inventory - current_rentals.length + return avail_inventory end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 341a62c3f..7728f59bc 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -39,9 +39,21 @@ end describe "custom methods" do - let(:movie) { Movie.first } - it "will return a value for movies_checked out" do - expect(movie.available_inventory).must_equal movie.inventory + let(:rental_data) { + { + customer_id: Customer.first.id, + movie_id: Movie.first.id, + } + } + + it "will return correct value for movies_checked out" do + Rental.destroy_all + movie = Movie.first + customer = Customer.first + rental = Rental.new(rental_data) + rental.prepare_for_checkout + + expect(movie.available_inventory).must_equal (movie.inventory - 1) end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 8aaf0502b..3af9e11c6 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -43,7 +43,7 @@ expect(@rental.prepare_for_checkout).must_equal true expect(@rental.checkout_date).must_equal Date.today - # expect(@rental.due_date).must_equal (Date.today + 7.days) UNCOMMENT AFTER FIXING DATATYPE THROUGH MIGRATION + expect(@rental.due_date).must_equal (Date.today + 7.days) expect(@rental.currently_checked_out).must_equal true end From c71d25007d1197c0b8c1b064dbbc6a6a96b5fda9 Mon Sep 17 00:00:00 2001 From: Angela Date: Wed, 15 May 2019 14:01:36 -0700 Subject: [PATCH 26/27] added movies_checked_out_count method that tracks rentals checked out and corresponding test --- app/models/customer.rb | 4 +++- test/models/customer_test.rb | 14 +++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index eca47cec2..fd55299c5 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,6 +5,8 @@ class Customer < ApplicationRecord validates :name, presence: true def movies_checked_out_count - return 0 # This should be zero until we the optional steps + # return 0 # This should be zero until we the optional steps + current_rentals = Rental.where(customer_id: self.id, currently_checked_out: true) + return current_rentals.length end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 0d9a13bfb..0445d1cd7 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -39,8 +39,20 @@ end describe "custom methods" do + let(:rental_data) { + { + customer_id: Customer.first.id, + movie_id: Movie.first.id, + } + } it "returns a value for movies_checked_out_count" do - expect(customer.movies_checked_out_count).must_equal 0 + Rental.destroy_all + movie = Movie.first + customer = Customer.first + rental = Rental.new(rental_data) + rental.prepare_for_checkout + + expect(customer.movies_checked_out_count).must_equal 1 end end end From fbc7a9b225a5cb3e5e0541bac8f4ba71d1d961a4 Mon Sep 17 00:00:00 2001 From: Angela Date: Wed, 15 May 2019 14:12:01 -0700 Subject: [PATCH 27/27] added new test for account for decreasing movie checked out value --- test/models/customer_test.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 0445d1cd7..8b3daa1f5 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -54,5 +54,17 @@ expect(customer.movies_checked_out_count).must_equal 1 end + + it "returns a value that takes into account rentals that have been checked back in for movies_checked_out_count" do + Rental.destroy_all + movie = Movie.first + customer = Customer.first + rental = Rental.new(rental_data) + rental.prepare_for_checkout + rental.currently_checked_out = false + + rental.save + expect(customer.movies_checked_out_count).must_equal 0 + end end end