From e216895503c9154852fc82fc30eab7d38830a92e Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Tue, 14 May 2019 13:06:22 -0700 Subject: [PATCH 01/25] initial 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 | 24 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 935 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..87697ba34 --- /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 + 2.0.1 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..3d1cb6bbe --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +UGQAsrjbAjz1O0KauOwSbptu6UaN3sGgWSDwJj73S27h9Y7sb8z9/3FE6vilLDAF5pAHpcRU7krtcAt23Wsg8qV6m8VUvRjWS4FbupeUZFwTDsXuBf6ZuWMN2elJmXK31Fu1fY8LKabPFpoT0tJ+N820TlF3YGuKOUG2DCsF88TAzpsZd/FeqkrB4yEf62n2S/q7hFM9AT6cMgRXDzBAIJO+6p2wYasEd3F3J63VWshGajI1SdHFNzQ62ODuq7jblJTUk92zzc5uPeXOX32R3n4F+CNW6oRXGBkeJuCzGFMmwOe0Z0l8dE3PUmRXn8rmBNhLiYO9P4zkN7gszHzCsv6SB873WebnOq7FcrQmEzvXH4fHJoZ5M+cwVLO7gLMQFLLAqnvvYDoSOPnN1AQ/zSd65p0Rdq3q4F2R--hmbaPN8bj0IX/Lla--e4h9Hg8yrYGaSra9mQBhYA== \ 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..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 647b0039bf3863acf758b97531370c4a062ac7a1 Mon Sep 17 00:00:00 2001 From: Chantal Demissie Date: Tue, 14 May 2019 13:13:00 -0700 Subject: [PATCH 02/25] added a route --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..005ce66e2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get "/customers/zomg", to: customers #zomg, as: zomg end From 6c272f4806192ba166c2a744ce7b1fbf2e7b09ae Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Tue, 14 May 2019 13:40:25 -0700 Subject: [PATCH 03/25] ran model migrations and generated schema --- app/models/customer.rb | 3 ++ app/models/movie.rb | 3 ++ app/models/rental.rb | 4 ++ db/migrate/20190514201920_create_movies.rb | 12 +++++ db/migrate/20190514202043_create_customers.rb | 15 ++++++ db/migrate/20190514202203_create_rentals.rb | 10 ++++ ...190514202742_add_foreign_keys_to_rental.rb | 6 +++ db/schema.rb | 52 +++++++++++++++++++ test/fixtures/customers.yml | 19 +++++++ test/fixtures/movies.yml | 13 +++++ test/fixtures/rentals.yml | 9 ++++ test/models/customer_test.rb | 9 ++++ test/models/movie_test.rb | 9 ++++ test/models/rental_test.rb | 9 ++++ 14 files changed, 173 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514201920_create_movies.rb create mode 100644 db/migrate/20190514202043_create_customers.rb create mode 100644 db/migrate/20190514202203_create_rentals.rb create mode 100644 db/migrate/20190514202742_add_foreign_keys_to_rental.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/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..d2533dbf9 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + has_many :rentals +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..b8b339cbc --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,3 @@ +class Movie < ApplicationRecord + has_many :rentals +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..af213142e --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie +end diff --git a/db/migrate/20190514201920_create_movies.rb b/db/migrate/20190514201920_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514201920_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/20190514202043_create_customers.rb b/db/migrate/20190514202043_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514202043_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20190514202203_create_rentals.rb b/db/migrate/20190514202203_create_rentals.rb new file mode 100644 index 000000000..5ebde2650 --- /dev/null +++ b/db/migrate/20190514202203_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :checkout_date + t.date :return_date + + t.timestamps + end + end +end diff --git a/db/migrate/20190514202742_add_foreign_keys_to_rental.rb b/db/migrate/20190514202742_add_foreign_keys_to_rental.rb new file mode 100644 index 000000000..6725c9719 --- /dev/null +++ b/db/migrate/20190514202742_add_foreign_keys_to_rental.rb @@ -0,0 +1,6 @@ +class AddForeignKeysToRental < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..8f01738b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,52 @@ +# 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_202742) 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 + + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.date "return_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..6899f8cd8 --- /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:20:43 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 13:20:43 + 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..11a5069bf --- /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: + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..568fb7fc1 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: 2019-05-14 + return_date: 2019-05-14 + +two: + checkout_date: 2019-05-14 + return_date: 2019-05-14 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/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 8f18e9087ea9d8ac7711af9c89db1d3a8ad67aba Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Tue, 14 May 2019 13:49:02 -0700 Subject: [PATCH 04/25] generated controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ app/controllers/rentals_controller.rb | 2 ++ config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ 7 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index 005ce66e2..ba34cd938 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get "/customers/zomg", to: customers #zomg, as: zomg + # get "/customers/zomg", to: customers #zomg, as: zomg end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 2b9bf0093c82d0e21cf68af9b18085f39eba0b5a Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Tue, 14 May 2019 13:57:19 -0700 Subject: [PATCH 05/25] fixed test route --- app/controllers/customers_controller.rb | 3 +++ config/routes.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..b96d01a1d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,5 @@ class CustomersController < ApplicationController + def zomg + render json: { :zomg => "it works"} + end end diff --git a/config/routes.rb b/config/routes.rb index ba34cd938..825699aa6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - # get "/customers/zomg", to: customers #zomg, as: zomg + get "/customers/zomg", to: 'customers#zomg', as: 'zomg' end From e673b181ae140a9404852a03af086925cd86cebb Mon Sep 17 00:00:00 2001 From: Chantal Demissie Date: Tue, 14 May 2019 14:19:21 -0700 Subject: [PATCH 06/25] added validations to model --- app/models/customer.rb | 2 ++ app/models/movie.rb | 3 +++ app/models/rental.rb | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..17b8454a6 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord has_many :rentals + + validates :name, prescence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index b8b339cbc..507b8d7e7 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,6 @@ class Movie < ApplicationRecord has_many :rentals + + validates :title, prescence: true + validates :inventory, prescence: true, numericality: { greater_than_or_equal_to: 0 } end diff --git a/app/models/rental.rb b/app/models/rental.rb index af213142e..8e3394a9f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,6 @@ class Rental < ApplicationRecord - belongs_to :customer - belongs_to :movie + belongs_to :customer + belongs_to :movie + + validates :checkout_date, prescence: true end From 465809e0c0c2d32150d9b403f315d77f632fecb9 Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Tue, 14 May 2019 14:37:17 -0700 Subject: [PATCH 07/25] starting validation tests for movie --- app/models/customer.rb | 2 +- app/models/movie.rb | 4 ++-- app/models/rental.rb | 2 +- config/routes.rb | 1 + test/fixtures/movies.yml | 22 ++++++++++++++-------- test/models/movie_test.rb | 21 +++++++++++++++++---- test/test_helper.rb | 3 ++- 7 files changed, 38 insertions(+), 17 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 17b8454a6..68e735ecb 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord has_many :rentals - validates :name, prescence: true + validates :name, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index 507b8d7e7..87eb43bd3 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord has_many :rentals - validates :title, prescence: true - validates :inventory, prescence: true, numericality: { greater_than_or_equal_to: 0 } + validates :title, presence: true + validates :inventory, presence: true, numericality: { greater_than_or_equal_to: 0 } end diff --git a/app/models/rental.rb b/app/models/rental.rb index 8e3394a9f..78b0f18e1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,5 +2,5 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - validates :checkout_date, prescence: true + validates :checkout_date, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 825699aa6..b14116462 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get "/customers/zomg", to: 'customers#zomg', as: 'zomg' end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 11a5069bf..356695ddf 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString +aladdin: + title: aladdin + overview: great movie release_date: 2019-05-14 - inventory: + inventory: 2 -two: - title: MyString - overview: MyString +pocahontas: + title: pocahontas + overview: awesome movie release_date: 2019-05-14 - inventory: + inventory: 1 + +pinnochio: + title: pinnochio + overview: sweet movie + release_date: 2019-05-14 + inventory: 0 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..204c37e56 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,22 @@ require "test_helper" - + describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:aladdin) } + + + describe "relationships" do + it "has rentals" do + expect(movie.rentals).must_respond_to :each + end + end + + describe "validations" do + it "valid movie has a title" do + + end + + it "invalid movie does not have a title" do - it "must be valid" do - value(movie).must_be :valid? + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 904cb5423ebad0fc12b193d465333b9fedf96c0e Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Tue, 14 May 2019 14:58:01 -0700 Subject: [PATCH 08/25] added relationship and validation tests for models --- test/fixtures/customers.yml | 28 ++++++++++++++-------------- test/fixtures/rentals.yml | 8 ++++++-- test/models/customer_test.rb | 19 ++++++++++++++++--- test/models/movie_test.rb | 13 ++++++++++++- test/models/rental_test.rb | 13 ++++++++++--- 5 files changed, 58 insertions(+), 23 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 6899f8cd8..66be1860d 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 +steph: + name: steph registered_at: 2019-05-14 13:20:43 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 123 cool road + city: seattle + state: washington + postal_code: 98104 + phone: 1234567890 -two: - name: MyString +chantal: + name: chantal registered_at: 2019-05-14 13:20:43 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 345 awesome road + city: seattle + state: washington + postal_code: 98104 + phone: 1234567890 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 568fb7fc1..5cb55b108 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: + movie: aladdin + customer: chantal checkout_date: 2019-05-14 - return_date: 2019-05-14 + return_date: 2019-05-17 two: + movie: pocahontas + customer: steph checkout_date: 2019-05-14 - return_date: 2019-05-14 + return_date: 2019-05-17 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..bd5deb8ef 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,22 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:chantal) } - it "must be valid" do - value(customer).must_be :valid? + describe "relationships" do + it "has rentals" do + expect(customer.rentals).must_respond_to :each + end + end + + describe "validations" do + it "valid customer has a name" do + expect(customer).must_be :valid? + end + + it "invalid customer does not have a name" do + customer.name = nil + expect(customer).wont_be :valid? + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 204c37e56..546ce9877 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -12,11 +12,22 @@ describe "validations" do it "valid movie has a title" do - + expect(movie).must_be :valid? end it "invalid movie does not have a title" do + movie.title = nil + expect(movie).wont_be :valid? + end + + it "invalid movie has no inventory" do + movie.inventory = nil + expect(movie).wont_be :valid? + end + it "invalid if inventory is a negative number" do + movie.inventory = -10 + expect(movie).wont_be :valid? end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..1bc442675 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,16 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:one) } - it "must be valid" do - value(rental).must_be :valid? + + describe "relationships" do + it "has a customer" do + expect(rental.customer).must_be_instance_of Customer + end + + it "has a movie" do + expect(rental.movie).must_be_instance_of Movie + end end end From a292f587241460b6eba9d20cbf7dedfed90ad8be Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Tue, 14 May 2019 15:41:47 -0700 Subject: [PATCH 09/25] starting actions --- .DS_Store | Bin 0 -> 8196 bytes app/controllers/customers_controller.rb | 13 ++++++++++--- config/routes.rb | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3b89a5f42bd7ab6f46b4d184c76bf1df62d1d3f6 GIT binary patch literal 8196 zcmeI1!EVzq7{@<1rAs>yJ%GAnE=U|Iv}!O8Xi_Pg&<;q5A~*orlD2Ho(xhtBRZxn0 z;T^^!@Fv_i@*q3_{6E`NiL+feASUd|{v7-Nx1C?pCeDaRbf*0l(FPH@$QIJQBummgtOTZGa1T2Ang8=T?oZJiU`>NNLmVhPjUlQQo z2M?KJTgRn}@}~oZ+yWq$(JT|{^5GxR;|9dGj!PBMf+Um`QCWrFVhFu=5Xz4Jw$?9I zRCW?_W{jg}7J7#w^wvXoQcj|+qAe`}OQ1-A_wEk)G@{Xdl-s{QK+o-;GD(|50fiJB zsxOABLOn_-rnk@@<+Y+=XscN*-Jvl}4aXd^^C9#TK= zD*1+MjUK}@lZ^G*W{7asm@Dsdb_`z?zA08U#_E_*VJ2egXBp}hsD^MH zVRe)I=)~-^S_k8W1wKsOR3(MahDm2t6L_0!`(*Pkazw5t2Ti*PVIsNZ;$ z#Hk;~gRwM+{Q)GeUxsl%nRSwB+@HvCx~juU1<0y%b*nsSS&#>@)$JLah zQ=wB(jB%xcd!8hJlQUY3Y486l^0s0LTn++`TIL4t|MxC_|9?47#;(#5umt{yfGF>F zcRR5DewZ*v;k~wpe2C16bxRec1%=#>BgzK>#MM6xQTHHaPg}>OifBQyF9IY6TUY{r GmB25{89mYf literal 0 HcmV?d00001 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index b96d01a1d..a4af1f0c2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,12 @@ class CustomersController < ApplicationController - def zomg - render json: { :zomg => "it works"} - end + def index + + end + + def show + + end + # def zomg + # render json: { :zomg => "it works"} + # end end diff --git a/config/routes.rb b/config/routes.rb index b14116462..418f8832f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :customers get "/customers/zomg", to: 'customers#zomg', as: 'zomg' end From 42eae2f6e1348aed1febc109ad125d855c5f2f81 Mon Sep 17 00:00:00 2001 From: Chantal Demissie Date: Tue, 14 May 2019 15:53:12 -0700 Subject: [PATCH 10/25] created index, smoke test passings --- app/controllers/customers_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a4af1f0c2..afbb83a13 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,12 +1,13 @@ class CustomersController < ApplicationController def index - + customers = Customer.all + render status: :ok, json: customers.as_json(only: [:name, :id, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end def show - end + # def zomg # render json: { :zomg => "it works"} - # end + # end end From 23623819ba3dfc0b3b4d2d6eafdd6dba063e79a1 Mon Sep 17 00:00:00 2001 From: Chantal Demissie Date: Tue, 14 May 2019 15:59:16 -0700 Subject: [PATCH 11/25] made test for customer index action --- config/routes.rb | 4 ++-- test/controllers/customers_controller_test.rb | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 418f8832f..9190590bc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :customers - get "/customers/zomg", to: 'customers#zomg', as: 'zomg' + resources :customers, only: [:index] + get "/customers/zomg", to: "customers#zomg", as: "zomg" end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..d27998608 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,10 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "returns a list of customers" do + get customers_path + must_respond_with :success + end + end end From d22127592a951c8a6561191b4c4a5cac141e9b2f Mon Sep 17 00:00:00 2001 From: Chantal Demissie Date: Tue, 14 May 2019 16:17:01 -0700 Subject: [PATCH 12/25] smoke tests passing --- app/controllers/movies_controller.rb | 16 ++++++++++++++++ config/routes.rb | 1 + test/controllers/movies_controller_test.rb | 21 ++++++++++++++++++--- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..253b3d274 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,18 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render status: :ok, json: movies.as_json(only: [:id, :title, :release_date]) + end + + def show + movie = Movie.find_by(id: params[:id]) + + if !movie.nil? + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), + status: :ok + else + render json: { ok: false, messages: ["Movie not found"] }, + status: :not_found + end + end end diff --git a/config/routes.rb b/config/routes.rb index 9190590bc..167823453 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,5 +2,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index] + resources :movies get "/customers/zomg", to: "customers#zomg", as: "zomg" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..7791aa033 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,22 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "returns a list of movies" do + get movies_path + must_respond_with :success + end + end + + describe "show" do + it "can get a movie" do + get movie_path(movies(:aladdin).id) + must_respond_with :success + end + + it "gives an error if movie is not found" do + get movie_path(-1) + must_respond_with :not_found + end + end end From 294fdb6a62d935d8bf34cf50a2bbda8e4c11c9c5 Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Tue, 14 May 2019 16:35:34 -0700 Subject: [PATCH 13/25] added createt action and test for movies controller --- .DS_Store | Bin 8196 -> 8196 bytes app/controllers/movies_controller.rb | 19 +++++++++++++++ test/controllers/movies_controller_test.rb | 27 +++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/.DS_Store b/.DS_Store index 3b89a5f42bd7ab6f46b4d184c76bf1df62d1d3f6..a0dbb99984c267129e282a2fdb499ff37cd01611 100644 GIT binary patch delta 98 zcmZp1XmQveEzEd&vW#$pw^Vhtv9XDcg08WNQLT+Nz51~6b`gwPE9P#Q+fnfydJdvlP;CT;+v`xQ9= delta 46 zcmZp1XmQveEzEdgvW##8r+9U>v9XDcg5l&9!g7o=CLb4;XPi0txo|ck Date: Tue, 14 May 2019 16:48:30 -0700 Subject: [PATCH 14/25] fixed movie params to match what api expects --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4e11abbf9..171d0d96f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -32,6 +32,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end From 8525f1d0d73bb7abc8367d47c1af601545a5d0ef Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Tue, 14 May 2019 16:51:08 -0700 Subject: [PATCH 15/25] fixed the movie create action test to match create action --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ea2e4665b..d019c51ad 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -32,7 +32,7 @@ it "creates a new movie given valid data" do expect { - post movies_path, params: { movie: movie_data } + post movies_path, params: movie_data }.must_change "Movie.count", 1 body = JSON.parse(response.body) From 2b7777211a2aa41c051922bdb3f90dccb77087f8 Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Wed, 15 May 2019 12:39:44 -0700 Subject: [PATCH 16/25] added tests for movie index --- .DS_Store | Bin 8196 -> 8196 bytes app/controllers/customers_controller.rb | 3 -- app/controllers/movies_controller.rb | 1 - test/controllers/movies_controller_test.rb | 32 ++++++++++++++++++++- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.DS_Store b/.DS_Store index a0dbb99984c267129e282a2fdb499ff37cd01611..e716e05056ff93fbe854601250e7b089697e6956 100644 GIT binary patch delta 45 zcmZp1XmQveEzEdovW##8mt=Ldp_ze>f}!E$<-+oevnC%0lCvj27tY=sD6*Lw07w1~ A&j0`b delta 46 zcmZp1XmQveEzEd&vW##8w^Vhtv9XDcg08X2n1CnzlKNHU093--d8vs+m B4+a1L diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index afbb83a13..6dee48786 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -7,7 +7,4 @@ def index def show end - # def zomg - # render json: { :zomg => "it works"} - # end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 171d0d96f..179f530cd 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -26,7 +26,6 @@ def create render json: { ok: false, messages: movie.errors.messages }, status: :bad_request end - end private diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d019c51ad..aa116399e 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -6,6 +6,37 @@ get movies_path must_respond_with :success end + + it "returns all of the movies" do + get movies_path + body = JSON.parse(response.body) + expect(body.length).must_equal Movie.count + end + + it "returns JSON" do + get movies_path + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "body returns an array" do + get movies_path + body = JSON.parse(response.body) + expect(body).must_be_kind_of Array + end + + it "returns movies with exactly the required fields" do + keys = %w(id release_date title) + + get movies_path + + body = JSON.parse(response.body) + + body.each do |movie| + expect(movie.keys.sort).must_equal keys + expect(movie.keys.length).must_equal keys.length + end + end end describe "show" do @@ -44,6 +75,5 @@ expect(movie.title).must_equal movie_data[:title] must_respond_with :success end - end end From 8d545df54e6fa373f1cf97a86508df4a97cc2c3d Mon Sep 17 00:00:00 2001 From: Chantal Demissie Date: Wed, 15 May 2019 13:28:12 -0700 Subject: [PATCH 17/25] customers controller tests --- test/controllers/customers_controller_test.rb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index d27998608..ca061af21 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -6,5 +6,25 @@ get customers_path must_respond_with :success end + + it "returns all the customers" do + get customers_path + body = JSON.parse(response.body) + expect(body.length).must_equal Customer.count + end + + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + + 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) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end end end From a2947592ce5766cbf31727df44fca5f5cf1ef424 Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Wed, 15 May 2019 13:47:00 -0700 Subject: [PATCH 18/25] added remaining movies controller tests --- app/controllers/movies_controller.rb | 6 ++-- test/controllers/movies_controller_test.rb | 38 +++++++++++++++++++++- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 179f530cd..f47ab7042 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -11,7 +11,7 @@ def show render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok else - render json: { ok: false, messages: ["Movie not found"] }, + render json: { ok: false, errors: ["Movie not found"] }, status: :not_found end end @@ -19,11 +19,11 @@ def show def create movie = Movie.new(movie_params) - if movie.save! + if movie.save render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]), status: :ok else - render json: { ok: false, messages: movie.errors.messages }, + render json: { ok: false, errors: movie.errors.messages }, status: :bad_request end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index aa116399e..58ac02d10 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -37,16 +37,37 @@ expect(movie.keys.length).must_equal keys.length end end + + # REVIST AFTER HANDLING FOREIGN KEY CONSTRAINT + # it "returns an empty array when there are no movies" do + # Movie.destroy_all + + # get movies_path + + # body = JSON.parse(response.body) + + # expect(body).must_equal [] + # end end describe "show" do - it "can get a movie" do + it "returns a movie that is valid" do + keys = %w(inventory overview release_date title ) get movie_path(movies(:aladdin).id) + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body.keys.sort).must_equal keys must_respond_with :success end it "gives an error if movie is not found" do get movie_path(-1) + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" must_respond_with :not_found end end @@ -75,5 +96,20 @@ expect(movie.title).must_equal movie_data[:title] must_respond_with :success end + + it "does not create movie with invalid parameters" do + movie_data[:title] = nil + + expect { + post movies_path, params: 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 From 2aaf145e433f9a46cdb88a0862d5533aed7c550b Mon Sep 17 00:00:00 2001 From: Chantal Demissie Date: Wed, 15 May 2019 14:41:41 -0700 Subject: [PATCH 19/25] checkout method added --- app/controllers/rentals_controller.rb | 19 +++++++++++++++++++ app/models/rental.rb | 2 +- config/routes.rb | 3 +++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..a0cd7b6a0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,21 @@ class RentalsController < ApplicationController + def check_out + rental = Rental.new(rental_params) + rental.return_date = Time.now + (60 * 60 * 24 * 7) + if rental.save + render status: :ok, json: { id: rental.id } + else + render json: { ok: false, errors: rental.errors.messages }, + status: :bad_request + end + end + + def check_in + end + + private + + def rental_params + params.permit(:movie_id, :customer_id) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 78b0f18e1..e1c49af35 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,5 +2,5 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - validates :checkout_date, presence: true + #validates :checkout_date, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 167823453..188c60388 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,8 @@ resources :customers, only: [:index] resources :movies + + post "/rentals/check_in", to: "rentals#check_in", as: "check_in" + post "/rentals/check_out", to: "rentals#check_out", as: "check_out" get "/customers/zomg", to: "customers#zomg", as: "zomg" end From 42bc89a72203949d2984b0f60fd853434ddc1015 Mon Sep 17 00:00:00 2001 From: Chantal Demissie Date: Wed, 15 May 2019 14:48:15 -0700 Subject: [PATCH 20/25] check in method created --- app/controllers/rentals_controller.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a0cd7b6a0..866045b37 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,6 +11,14 @@ def check_out end def check_in + rental = Rental.find_by(rental_params) + if rental + rental.update(return_date: Time.now) + render status: :ok, json: { id: rental.id } + else + render json: { ok: false, messages: ["Rental not found"] }, + status: :not_found + end end private From ac005b8a159ea79f6bf2b64494c80ccf42a35674 Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Wed, 15 May 2019 17:30:54 -0700 Subject: [PATCH 21/25] adding tests for rentals controller --- app/controllers/customers_controller.rb | 3 - app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 70 ++++++++++++++++++++- 3 files changed, 68 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6dee48786..78fb5051f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,7 +4,4 @@ def index render status: :ok, json: customers.as_json(only: [:name, :id, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end - def show - end - end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 866045b37..a5e39f708 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -17,7 +17,7 @@ def check_in render status: :ok, json: { id: rental.id } else render json: { ok: false, messages: ["Rental not found"] }, - status: :not_found + status: :bad_request end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..9a5e12c47 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,71 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + let(:rental_data){ + { + movie_id: movies(:aladdin).id, + customer_id: customers(:steph).id, + } + } + + describe "checkout" do + it "creates a new rental with valid information" do + expect{ + post check_out_path, params: rental_data + }.must_change 'Rental.count', +1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + rental = Rental.find(body["id"].to_i) + + expect(rental.movie.id).must_equal rental_data[:movie_id] + must_respond_with :success + end + + + it "does not create a rental with invalid information for movie" do + rental_data[:movie_id] = -1 + + expect { + post check_out_path, params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + must_respond_with :bad_request + end + + it "does not create a rental with invalid information for customer" do + rental_data[:customer_id] = -1 + + expect { + post check_out_path, params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + must_respond_with :bad_request + + end + end + + describe "checkin" do + it "can check in a rental that was checked out" do + post check_out_path, params: rental_data + post check_in_path, params: rental_data + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + rental = Rental.find(body["id"].to_i) + + expect(rental.return_date).wont_equal nil + must_respond_with :success + end + end end From aa57a1c54fb4db06599e330e9b5b689618dac508 Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Wed, 15 May 2019 19:11:21 -0700 Subject: [PATCH 22/25] added tests for check in --- test/controllers/rentals_controller_test.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9a5e12c47..b917336d4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -67,5 +67,15 @@ expect(rental.return_date).wont_equal nil must_respond_with :success end + + it "returns error if trying to check in without a check out" do + post check_in_path, params: rental_data + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "messages" + must_respond_with :bad_request + end + end end From cedbb49fa33873c1908acf8a413476a9bc931d49 Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Thu, 16 May 2019 09:41:50 -0700 Subject: [PATCH 23/25] added migration for movies checked out count --- db/migrate/20190516163829_add_movies_checkout_out_count.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190516163829_add_movies_checkout_out_count.rb diff --git a/db/migrate/20190516163829_add_movies_checkout_out_count.rb b/db/migrate/20190516163829_add_movies_checkout_out_count.rb new file mode 100644 index 000000000..29acbd26b --- /dev/null +++ b/db/migrate/20190516163829_add_movies_checkout_out_count.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckoutOutCount < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 8f01738b3..9d825556d 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_202742) do +ActiveRecord::Schema.define(version: 2019_05_16_163829) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| From 3b0f7fe777bf8da3f728af947d20744097843889 Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Fri, 17 May 2019 11:10:14 -0700 Subject: [PATCH 24/25] adding available inventory column to schema --- app/controllers/customers_controller.rb | 1 - db/migrate/20190517180439_add_available_inventory.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20190517180439_add_available_inventory.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 78fb5051f..55690d297 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,5 +3,4 @@ def index customers = Customer.all render status: :ok, json: customers.as_json(only: [:name, :id, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end - end diff --git a/db/migrate/20190517180439_add_available_inventory.rb b/db/migrate/20190517180439_add_available_inventory.rb new file mode 100644 index 000000000..31a8a7bbe --- /dev/null +++ b/db/migrate/20190517180439_add_available_inventory.rb @@ -0,0 +1,5 @@ +class AddAvailableInventory < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 9d825556d..126614c67 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_16_163829) do +ActiveRecord::Schema.define(version: 2019_05_17_180439) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From 3c90dd3090bcc95c17fe21e7ba399547780486b7 Mon Sep 17 00:00:00 2001 From: Stephanie Marchante Date: Fri, 17 May 2019 12:07:38 -0700 Subject: [PATCH 25/25] fixed available inventory status --- app/controllers/movies_controller.rb | 1 + app/models/customer.rb | 1 + app/models/movie.rb | 7 +++++++ config/routes.rb | 3 +-- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- test/fixtures/customers.yml | 2 ++ test/fixtures/movies.yml | 3 +++ test/models/movie_test.rb | 6 ++++++ 9 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f47ab7042..a630794db 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,6 +18,7 @@ def show def create movie = Movie.new(movie_params) + movie.available_inventory = movie.inventory if movie.save render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]), diff --git a/app/models/customer.rb b/app/models/customer.rb index 68e735ecb..ccdfef420 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,4 +2,5 @@ class Customer < ApplicationRecord has_many :rentals validates :name, presence: true + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 87eb43bd3..9595126f8 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,11 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, presence: true, numericality: { greater_than_or_equal_to: 0 } + + def available_inventory + inventory = self.inventory + rentals = self.rentals.count{ |rental| rental.return_date.nil? } + avail_inventory = inventory - rentals + return avail_inventory + end end diff --git a/config/routes.rb b/config/routes.rb index 188c60388..c6c678af5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,8 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index] - resources :movies + resources :movies, only: [:index, :show, :create] post "/rentals/check_in", to: "rentals#check_in", as: "check_in" post "/rentals/check_out", to: "rentals#check_out", as: "check_out" - get "/customers/zomg", to: "customers#zomg", as: "zomg" end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ca061af21..49b0add62 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -19,7 +19,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| diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 58ac02d10..602e8eba6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -52,7 +52,7 @@ describe "show" do it "returns a movie that is valid" do - keys = %w(inventory overview release_date title ) + keys = %w(available_inventory inventory overview release_date title ) get movie_path(movies(:aladdin).id) body = JSON.parse(response.body) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 66be1860d..fa690c27d 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,6 +8,7 @@ steph: state: washington postal_code: 98104 phone: 1234567890 + movies_checked_out_count: 0 chantal: name: chantal @@ -17,3 +18,4 @@ chantal: state: washington postal_code: 98104 phone: 1234567890 + movies_checked_out_count: 0 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 356695ddf..633499d83 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,15 +5,18 @@ aladdin: overview: great movie release_date: 2019-05-14 inventory: 2 + available_inventory: 2 pocahontas: title: pocahontas overview: awesome movie release_date: 2019-05-14 inventory: 1 + available_inventory: 1 pinnochio: title: pinnochio overview: sweet movie release_date: 2019-05-14 inventory: 0 + available_inventory: 0 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 546ce9877..50b3ae33e 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -30,4 +30,10 @@ expect(movie).wont_be :valid? end end + + describe "available inventory" do + it "returns movies available inventory" do + expect(movie.available_inventory).must_equal 2 + end + end end