From e462cf250cf454b034df8ca264f044b09bc8ce74 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Wed, 27 May 2020 10:45:34 -0700 Subject: [PATCH 01/45] api setup complete --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/controllers/customers_controller.rb | 2 + app/controllers/movie_controller.rb | 2 + app/controllers/rental_controller.rb | 2 + app/jobs/application_job.rb | 7 + 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 | 114 ++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ 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 | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ 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 | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/schema.rb | 18 ++ lib/tasks/.keep | 0 log/.keep | 0 node_modules/.yarn-integrity | 10 + public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + test/controllers/.keep | 0 test/controllers/customers_controller_test.rb | 7 + test/controllers/movie_controller_test.rb | 7 + test/controllers/rental_controller_test.rb | 7 + 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 | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 yarn.lock | 4 + 68 files changed, 1165 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movie_controller.rb create mode 100644 app/controllers/rental_controller.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 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 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 node_modules/.yarn-integrity create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movie_controller_test.rb create mode 100644 test/controllers/rental_controller_test.rb 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 tmp/pids/.keep create mode 100644 vendor/.keep create mode 100644 yarn.lock diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# 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 pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.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..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..95c25b78d --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', 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.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 :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +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..7f91bc2cb --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/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/movie_controller.rb b/app/controllers/movie_controller.rb new file mode 100644 index 000000000..d68e28fb1 --- /dev/null +++ b/app/controllers/movie_controller.rb @@ -0,0 +1,2 @@ +class MovieController < ApplicationController +end diff --git a/app/controllers/rental_controller.rb b/app/controllers/rental_controller.rb new file mode 100644 index 000000000..55344c535 --- /dev/null +++ b/app/controllers/rental_controller.rb @@ -0,0 +1,2 @@ +class RentalController < ApplicationController +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +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..a71368e32 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end 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..0e39e8cb1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # 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') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + 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..d89ee495f --- /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/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..43301a817 --- /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_mailbox/engine" +require "action_text/engine" +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 + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # 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..6b21ab7bc --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video_store_api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..04182a5d2 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +mtouxXxdeZEZkjbdISku1ZAtiWzSwLXJfdb9TRS49NIVGA494Ef1cowwhMhsSlXEeg2MCA5s+Jz8di1VUwQVs6fcX2tf5J7MrkGTt9YRNCp3tII9K2g6GcM67ZVoD+okkEWvL/ABxETPPC8IJEID0D9EIUkNr7qmS2+etqltNwvp0tNjvYmE8WrsLpSiyirXqdHU9smxNnB8+uDW9sfl2fukSer/NTcXKjM5kLvJIr4kB7RRYW5vTjzuPRDialMDYHRniU7R+7DUxFBqjrY9Pnbfmp2/IH6aVIf2aXunw7+fUtuBdeTJQzXKP2euScRPfzoYIYqVFvJ1Xrf2jzhC6opFif7mLD5H07Js7D3wkOnrDa+YGL4Z1CxVABlKWPgGnS6iZxZn5E9GO6z8MXwnTRb+MX8a+8bJP7Lk--WQHajhIuTp5IuuHn--0F3+KFy42NfEofVY18N7Cg== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS 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 + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_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: video_store_api + + # 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: video_store_api_test + +# As with config/credentials.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 https://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: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_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..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +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.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..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +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 + + # 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 = "video_store_api_production" + + 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 + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# 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! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = 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 + config.cache_store = :null_store + + # 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..cf9b342d0 --- /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 https://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..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# 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. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_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 `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server 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..c06383a17 --- /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 https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) 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/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..b10373ba6 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 000000000..1a2b97a7f --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "darwin-x64-79", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://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/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/movie_controller_test.rb b/test/controllers/movie_controller_test.rb new file mode 100644 index 000000000..f56ddaf0b --- /dev/null +++ b/test/controllers/movie_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MovieController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/rental_controller_test.rb b/test/controllers/rental_controller_test.rb new file mode 100644 index 000000000..779a90044 --- /dev/null +++ b/test/controllers/rental_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end 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..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +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 +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # 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/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 000000000..fb57ccd13 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From 7c2216e5e4c35f44759b3d277ad945e56446cb31 Mon Sep 17 00:00:00 2001 From: Yaz Date: Thu, 28 May 2020 17:33:00 -0700 Subject: [PATCH 02/45] set up video model --- app/models/video.rb | 7 +++++++ db/migrate/20200528052524_create_videos.rb | 13 +++++++++++++ db/schema.rb | 12 +++++++++++- test/models/video_test.rb | 7 +++++++ 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200528052524_create_videos.rb create mode 100644 test/models/video_test.rb diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..777455e5c --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,7 @@ +class Video < ApplicationRecord + validates :title, presence: true, length: { minimum: 1, maximum: 200 } + validates :overview, presence: true, length: { minimum: 1, maximum: 1000 } + validates :release_date, presence: true, format: { with: /\d{4}-\d{2}-\d{2}/, message: "must be in YYYY-MM-DD format"} + validates :total_inventory, presence: true, numericality: { only_integer: true, message: "must be integer" } + validates :available_inventory, presence: true, numericality: { only_integer: true, message: "must be integer" } +end diff --git a/db/migrate/20200528052524_create_videos.rb b/db/migrate/20200528052524_create_videos.rb new file mode 100644 index 000000000..282e7354c --- /dev/null +++ b/db/migrate/20200528052524_create_videos.rb @@ -0,0 +1,13 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index b10373ba6..5b3eb01ee 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,19 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 2020_05_28_052524) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + end diff --git a/test/models/video_test.rb b/test/models/video_test.rb new file mode 100644 index 000000000..eead50d2f --- /dev/null +++ b/test/models/video_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Video do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From d405671a3d5a156fdebfb6d633e748c75fea6929 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 28 May 2020 17:33:07 -0700 Subject: [PATCH 03/45] defined customers --- app/controllers/customers_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..9fa59d27e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,6 @@ class CustomersController < ApplicationController + def index + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, ]) + render json: customers, status: :ok + end end From 5a5591aba78f98df0e12d9a52951eacbcf5c4e98 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 28 May 2020 17:34:14 -0700 Subject: [PATCH 04/45] added cutomers and rentals --- db/schema.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/db/schema.rb b/db/schema.rb index b10373ba6..644cafd78 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -15,4 +15,27 @@ # 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 "rentals", force: :cascade do |t| + # t.date "check_out_date" + # t.date "check_in_date" + # t.date "due_date" + # t.datetime "created_at", null: false + # t.datetime "updated_at", null: false + # end + + end From 073a124fac88d60409dde5386356634fd9938e74 Mon Sep 17 00:00:00 2001 From: Yaz Date: Thu, 28 May 2020 17:44:25 -0700 Subject: [PATCH 05/45] videos controller with routes, tests, actions --- app/controllers/videos_controller.rb | 35 ++++++++++++ config/routes.rb | 2 + test/controllers/videos_controller_test.rb | 64 ++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 app/controllers/videos_controller.rb create mode 100644 test/controllers/videos_controller_test.rb diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..405079777 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,35 @@ +class VideosController < ApplicationController + def index + videos = Video.all.as_json(only: [:id, :title, :release_date, :available_inventory]) + render json: videos.as_json, status: :ok + end + + def create + video = Video.new(video_params) + if video.save + render json: video.as_json(only: [:id]), status: :created + else + render json: { + ok: false, + error: video.errors.messages + }, status: :bad_request + end + end + + def show + video = Video.find_by(id: params[:id]).as_json + if video + render json: video.as_json([:id, :title, :release_date, :available_inventory, :total_inventory]), status: :ok + else + render json: { + ok: false, + error: video.errors.messages + }, status: :not_found + end + end + + private + def video_params + return params.require(:video).permit(:id, :title, :overview, :release_date, :total_inventory, :available_inventory) + end +end diff --git a/config/routes.rb b/config/routes.rb index c06383a17..b5d093ba9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do + + resources :videos, only: [:index, :show, :create] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..7d0010d39 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,64 @@ +require "test_helper" + +describe VideosController do + describe "video#index" do + it "responds with success" do + get videos_path + must_respond_with :success + end + it "when no videos, responds with success and empty array" do + Video.destroy_all + get videos_path + must_respond_with :success + body = JSON.parse(response.body) + expect(body).must_equal [] + end + it "returns array of hashes, with expected attributes" do + get videos_path + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + video_attr = ["id", "title", "release_date", "available_inventory"] + body.each do |video| + expect(video).must_be_instance_of Hash + expect(pet.keys.sort).must_equal video_attr.sort + end + end + end + + # describe "video#create" do + # before do + # @good_video_data = { + # "title" => "Blacksmith Of The Banished", + # "overview" => "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", + # "release_date" => "1979-01-18", + # "total_inventory" => 10, + # "available_inventory" => 9 + # } + # @bad_video_data = { + # "hello" => "this is bad!", + # "much" => 5, + # "ick" => "not what I was expecting" + # } + # @empty_video_data = {} + # end + + # it "responds with success when sent good data" do + # post videos_path, params: @good_video_data + # must_respond_with :created + # end + # it "responds with failure when sent bad data" do + # post videos_path, params: @bad_video_data + # must_respond_with :bad_request + # end + + # end + + # describe "video#show" do + # skip + # it "responds with success with valid id" do + # # id = # valid id + # # get video_path(id) + # # must_respond_with :success + # end + # end +end From 1efa84e82862c0dec8b29f082af158a8d27c6947 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 28 May 2020 23:14:56 -0700 Subject: [PATCH 06/45] added rental model --- app/models/rental.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 app/models/rental.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..028f1d81f --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,7 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + + validates :due_date, presence: true + validates :checkout_date, presence: true +end From 7c5b8a52a698477bc7538a6b138f82dedf64efc2 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 28 May 2020 23:15:58 -0700 Subject: [PATCH 07/45] added rentals schema --- db/migrate/20200529061123_create_rentals.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 db/migrate/20200529061123_create_rentals.rb diff --git a/db/migrate/20200529061123_create_rentals.rb b/db/migrate/20200529061123_create_rentals.rb new file mode 100644 index 000000000..07e45081a --- /dev/null +++ b/db/migrate/20200529061123_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.date :check_out_date + t.date :check_in_date + t.date :due_date + + t.timestamps + end + end +end From 475e66bed4437da7eaff2cb55c4a0527f75885dd Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 28 May 2020 23:22:56 -0700 Subject: [PATCH 08/45] added created test page for rentals --- test/models/rental_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 test/models/rental_test.rb diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 2a057879c391f8e30d41e21188519f31c4cf6bbb Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 28 May 2020 23:26:44 -0700 Subject: [PATCH 09/45] added customer and rental schema migrations --- db/schema.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index bb98f66a7..98e6259a1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -37,12 +37,10 @@ t.datetime "updated_at", precision: 6, null: false end - # create_table "rentals", force: :cascade do |t| - # t.date "check_out_date" - # t.date "check_in_date" - # t.date "due_date" - # t.datetime "created_at", null: false - # t.datetime "updated_at", null: false - # end - + create_table "rentals", force: :cascade do |t| + t.date "check_out_date" + t.date "check_in_date" + t.date "due_date" + t.datetime "created_at", null: + t.datetime "updated_at", null: false end From d0032bf0449f845ae510f320892da65b3fdf671f Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 28 May 2020 23:28:14 -0700 Subject: [PATCH 10/45] added routes for cutomers and rentals --- config/routes.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index b5d093ba9..224930986 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do - + resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] + resources :rentals, only: [:create] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From d3b6590a1a882903d0b82dad59a711fbeb337763 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 28 May 2020 23:31:17 -0700 Subject: [PATCH 11/45] deleted --- app/controllers/movie_controller.rb | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 app/controllers/movie_controller.rb diff --git a/app/controllers/movie_controller.rb b/app/controllers/movie_controller.rb deleted file mode 100644 index d68e28fb1..000000000 --- a/app/controllers/movie_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class MovieController < ApplicationController -end From cd18b3135ccaef14037abbca2935ac2c07e69223 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 28 May 2020 23:31:38 -0700 Subject: [PATCH 12/45] deleted --- test/controllers/movie_controller_test.rb | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 test/controllers/movie_controller_test.rb diff --git a/test/controllers/movie_controller_test.rb b/test/controllers/movie_controller_test.rb deleted file mode 100644 index f56ddaf0b..000000000 --- a/test/controllers/movie_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require "test_helper" - -describe MovieController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end -end From f1f04bf00e502650c78ee6c5d85aba6bbfca8292 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 00:34:11 -0700 Subject: [PATCH 13/45] trying to get test to pass --- app/controllers/rental_controller.rb | 30 +++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/app/controllers/rental_controller.rb b/app/controllers/rental_controller.rb index 55344c535..8ba31685e 100644 --- a/app/controllers/rental_controller.rb +++ b/app/controllers/rental_controller.rb @@ -1,2 +1,30 @@ -class RentalController < ApplicationController +class RentalsController < ApplicationController + + def check_out + rental = Rental.check_out(@customer, @movie) + if rental + render json: rental.as_json(only: [:id]), status: :ok + return + else + render json: { ok: false, errors: "Not Found"}, status: :not_found + return + end + end + + def check_in + rental = Rental.check_in(@rental) + if rental + render json: rental.as_json(only: [:id]), status: :ok + return + else + render json: { ok: false, errors: "Not Found"}, status: :not_found + return + end + end + + private + def rental_params + params.permit(:video_id, :customer_id) + end + end From ccb53e0ea6e6155896091db5648b91dc573ed526 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 00:35:47 -0700 Subject: [PATCH 14/45] added tests and passed --- test/models/customer_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 test/models/customer_test.rb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 10bea0b102e75bd3bfc64f54af8edcbec25eea96 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 00:37:16 -0700 Subject: [PATCH 15/45] verifed/updated the relationships --- app/models/customer.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 app/models/customer.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..c64aa790d --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,15 @@ +class Customer < ApplicationRecord + has_many :rentals + has_many :videos, through: :rentals, dependent: :nullify + + validates :name, presence: true + validates :registered_at, presence: true + validates :phone, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :movies_checked_out_count, presence: true +end + + From b0e09ddae85f6bb448f09900876c12d20dc42d3d Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 00:38:07 -0700 Subject: [PATCH 16/45] updated and verfied schema for customers and rentals --- db/schema.rb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 98e6259a1..f9d9eb8d8 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: 2020_05_28_052524) do +ActiveRecord::Schema.define(version: 2020_05_29_061123) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -23,8 +23,16 @@ t.string "state" t.string "postal_code" t.string "phone" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "check_out_date" + t.date "check_in_date" + t.date "due_date" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false end create_table "videos", force: :cascade do |t| @@ -37,10 +45,4 @@ t.datetime "updated_at", precision: 6, null: false end - create_table "rentals", force: :cascade do |t| - t.date "check_out_date" - t.date "check_in_date" - t.date "due_date" - t.datetime "created_at", null: - t.datetime "updated_at", null: false end From 64bf6b15db117208bc6055cfe19648b9e279451b Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 00:41:54 -0700 Subject: [PATCH 17/45] fixed migration errors --- db/migrate/20200529060218_create_customers.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 db/migrate/20200529060218_create_customers.rb diff --git a/db/migrate/20200529060218_create_customers.rb b/db/migrate/20200529060218_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20200529060218_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + 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 From d4ec9bbbadd258bb77efa8d3ad8de453060c591d Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 00:50:12 -0700 Subject: [PATCH 18/45] added test, need to verify is they are passing --- test/controllers/customers_controller_test.rb | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..e9da8b377 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,45 @@ require "test_helper" describe CustomersController do + CUSTOMER_KEYS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone", "movies_checked_out_count"].sort # it "does a thing" do # value(1+1).must_equal 2 # end + describe CustomersController do + it "responds with JSON and success" do + get customers_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end + + it "responds with an array of customer hashes" do + # Act + get customers_path + + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + body.each do |customer| + expect(customer).must_be_instance_of Hash + required_cust_attrs = ["id", "name", "phone", "postal_code", "registered_at", "videos_checked_out_count"] + + expect(customer.keys.sort).must_equal CUSTOMER_KEYS + end + end + + it "will respond with an empty array when there are no customers" do + # Arrange + Customer.destroy_all + + # Act + get customers_path + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end + end end From cd683ecaad50eb7ed2c7058770d52d7bac4341d7 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 00:51:03 -0700 Subject: [PATCH 19/45] verfied customers fields --- app/controllers/customers_controller.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 9fa59d27e..228eabbbf 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,8 @@ class CustomersController < ApplicationController - def index - customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, ]) - render json: customers, status: :ok - end + def index + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, ]) + render json: customers, status: :ok + end + end + From 3a834cde971106085bbee36f7cb7f1abb5c457a8 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 00:51:38 -0700 Subject: [PATCH 20/45] verfied customers fields --- app/controllers/customers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 228eabbbf..d4dfb7685 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, ]) + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, ]) render json: customers, status: :ok end From ed23042f01fd004b281897c2388ba59b16482d7b Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 00:52:15 -0700 Subject: [PATCH 21/45] ran yarn --- node_modules/.yarn-integrity | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index 1a2b97a7f..833cabeb5 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -1,6 +1,8 @@ { - "systemParams": "darwin-x64-79", - "modulesFolders": [], + "systemParams": "darwin-x64-83", + "modulesFolders": [ + "node_modules" + ], "flags": [], "linkedModules": [], "topLevelPatterns": [], From 6cfa52826b73acaf44873878617e65ee87ad1c97 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 09:05:47 -0700 Subject: [PATCH 22/45] not needed, double --- app/controllers/rental_controller.rb | 30 ---------------------------- 1 file changed, 30 deletions(-) delete mode 100644 app/controllers/rental_controller.rb diff --git a/app/controllers/rental_controller.rb b/app/controllers/rental_controller.rb deleted file mode 100644 index 8ba31685e..000000000 --- a/app/controllers/rental_controller.rb +++ /dev/null @@ -1,30 +0,0 @@ -class RentalsController < ApplicationController - - def check_out - rental = Rental.check_out(@customer, @movie) - if rental - render json: rental.as_json(only: [:id]), status: :ok - return - else - render json: { ok: false, errors: "Not Found"}, status: :not_found - return - end - end - - def check_in - rental = Rental.check_in(@rental) - if rental - render json: rental.as_json(only: [:id]), status: :ok - return - else - render json: { ok: false, errors: "Not Found"}, status: :not_found - return - end - end - - private - def rental_params - params.permit(:video_id, :customer_id) - end - -end From cdcfb06bf1a64f3da58d14ca80ab7841aec60689 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 09:06:30 -0700 Subject: [PATCH 23/45] not needed, double --- test/controllers/rental_controller_test.rb | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 test/controllers/rental_controller_test.rb diff --git a/test/controllers/rental_controller_test.rb b/test/controllers/rental_controller_test.rb deleted file mode 100644 index 779a90044..000000000 --- a/test/controllers/rental_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require "test_helper" - -describe RentalController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end -end From 5f4b6e31fbafe3063c1a7a30594afd72a7eeace7 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 09:31:12 -0700 Subject: [PATCH 24/45] fixed indentations --- app/models/customer.rb | 2 +- test/controllers/customers_controller_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index c64aa790d..a1c1913b7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -9,7 +9,7 @@ class Customer < ApplicationRecord validates :city, presence: true validates :state, presence: true validates :postal_code, presence: true - validates :movies_checked_out_count, presence: true + validates :videos_checked_out_count, presence: true end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index e9da8b377..dd72d4d4e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - CUSTOMER_KEYS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone", "movies_checked_out_count"].sort + CUSTOMER_KEYS = ["id", "name", "registered_at", "address", "city", "state", "postal_code", "phone", "videos_checked_out_count"].sort # it "does a thing" do # value(1+1).must_equal 2 # end @@ -23,7 +23,7 @@ expect(body).must_be_instance_of Array body.each do |customer| expect(customer).must_be_instance_of Hash - required_cust_attrs = ["id", "name", "phone", "postal_code", "registered_at", "videos_checked_out_count"] + # required_cust_attrs = ["id", "name", "phone", "postal_code", "registered_at", "videos_checked_out_count"] expect(customer.keys.sort).must_equal CUSTOMER_KEYS end From 694a3c3d173b81c17d3f251da5f10e80f2ca944c Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 09:32:27 -0700 Subject: [PATCH 25/45] merge changes --- app/controllers/rentals_controller.rb | 5 ++ app/controllers/videos_controller.rb | 6 +- db/schema.rb | 3 + test/controllers/rentals_controller_test.rb | 7 ++ test/controllers/videos_controller_test.rb | 82 ++++++++++++--------- 5 files changed, 66 insertions(+), 37 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..74d3fc56c --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,5 @@ +class RentalsController < ApplicationController + def check_in + end + def check_out +end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 405079777..0fceab784 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -17,19 +17,19 @@ def create end def show - video = Video.find_by(id: params[:id]).as_json + video = Video.find_by(id: params[:id]) if video render json: video.as_json([:id, :title, :release_date, :available_inventory, :total_inventory]), status: :ok else render json: { ok: false, - error: video.errors.messages + #errors: video.errors.messages }, status: :not_found end end private def video_params - return params.require(:video).permit(:id, :title, :overview, :release_date, :total_inventory, :available_inventory) + return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end diff --git a/db/schema.rb b/db/schema.rb index f9d9eb8d8..77721f9ea 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -15,6 +15,7 @@ # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" +<<<<<<< Updated upstream create_table "customers", force: :cascade do |t| t.string "name" t.datetime "registered_at" @@ -35,6 +36,8 @@ t.datetime "updated_at", precision: 6, null: false end +======= +>>>>>>> Stashed changes create_table "videos", force: :cascade do |t| t.string "title" t.string "overview" diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 7d0010d39..e677b9f4d 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -25,40 +25,54 @@ end end - # describe "video#create" do - # before do - # @good_video_data = { - # "title" => "Blacksmith Of The Banished", - # "overview" => "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", - # "release_date" => "1979-01-18", - # "total_inventory" => 10, - # "available_inventory" => 9 - # } - # @bad_video_data = { - # "hello" => "this is bad!", - # "much" => 5, - # "ick" => "not what I was expecting" - # } - # @empty_video_data = {} - # end - - # it "responds with success when sent good data" do - # post videos_path, params: @good_video_data - # must_respond_with :created - # end - # it "responds with failure when sent bad data" do - # post videos_path, params: @bad_video_data - # must_respond_with :bad_request - # end + describe "video#create" do + let(:good_video_data) { + { + video: { + title: "Blacksmith Of The Banished", + overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", + release_date: "1979-01-18", + total_inventory: 10, + available_inventory: 9 + } + } + } + let(:bad_video_data) { + { + video: { + hello: "this is bad!", + much: 5, + ick: "not what I was expecting" + } + } + } + + let(:empty_video_data) {{video:{}}} + + it "responds with success when sent good data, successfully created new video" do + expect { + post videos_path, params: good_video_data + }.must_differ "Video.count", 1 + + must_respond_with :created + end + it "responds with failure when sent bad data" do + post videos_path, params: bad_video_data + must_respond_with :bad_request + end + it "responds with failure when sent empty data set" do + expect{ + post videos_path, params: empty_video_data + }.must_raise ActionController::ParameterMissing + end - # end + end - # describe "video#show" do - # skip - # it "responds with success with valid id" do - # # id = # valid id - # # get video_path(id) - # # must_respond_with :success - # end - # end + describe "video#show" do + it "responds with success with valid id" do + first_video = Video.first + get video_path(first_video.id) + must_respond_with :success + end + end end From 0dda4bb435768f0cd55b4c8a389509f07af9e41f Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 09:44:03 -0700 Subject: [PATCH 26/45] rental migration, connecting customer and video --- app/models/rental.rb | 2 +- ...529163924_connecting_rentals_to_video_and_customer.rb | 6 ++++++ db/schema.rb | 9 +++++---- 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20200529163924_connecting_rentals_to_video_and_customer.rb diff --git a/app/models/rental.rb b/app/models/rental.rb index 028f1d81f..7f2e31308 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,6 @@ class Rental < ApplicationRecord belongs_to :customer - belongs_to :movie + belongs_to :video validates :due_date, presence: true validates :checkout_date, presence: true diff --git a/db/migrate/20200529163924_connecting_rentals_to_video_and_customer.rb b/db/migrate/20200529163924_connecting_rentals_to_video_and_customer.rb new file mode 100644 index 000000000..32b392753 --- /dev/null +++ b/db/migrate/20200529163924_connecting_rentals_to_video_and_customer.rb @@ -0,0 +1,6 @@ +class ConnectingRentalsToVideoAndCustomer < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :video, index: true + add_reference :rentals, :customer, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 77721f9ea..0fd2bab30 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,12 +10,11 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_29_061123) do +ActiveRecord::Schema.define(version: 2020_05_29_163924) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" -<<<<<<< Updated upstream create_table "customers", force: :cascade do |t| t.string "name" t.datetime "registered_at" @@ -34,10 +33,12 @@ t.date "due_date" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.bigint "video_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" end -======= ->>>>>>> Stashed changes create_table "videos", force: :cascade do |t| t.string "title" t.string "overview" From ff64a50a2500b0ddcd5b5bc90d7a0bd87d8842a3 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 09:46:41 -0700 Subject: [PATCH 27/45] validation: customer_id and video_ must be present --- app/models/rental.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 7f2e31308..d68f5158d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,4 +4,6 @@ class Rental < ApplicationRecord validates :due_date, presence: true validates :checkout_date, presence: true + validates :video_id, presence: true + validates :customer_id, presence: true end From 6186b2417fea36995888aa08eb3beb7bd89e7526 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 10:17:04 -0700 Subject: [PATCH 28/45] changed rental table.model --- app/models/rental.rb | 7 +++++-- db/migrate/20200529171449_remove_rental_fields.rb | 5 +++++ db/schema.rb | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20200529171449_remove_rental_fields.rb diff --git a/app/models/rental.rb b/app/models/rental.rb index d68f5158d..0314055c4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,8 +2,11 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video - validates :due_date, presence: true - validates :checkout_date, presence: true validates :video_id, presence: true validates :customer_id, presence: true + + def due_date + return self.created_at + 1.week + end + end diff --git a/db/migrate/20200529171449_remove_rental_fields.rb b/db/migrate/20200529171449_remove_rental_fields.rb new file mode 100644 index 000000000..4a3907734 --- /dev/null +++ b/db/migrate/20200529171449_remove_rental_fields.rb @@ -0,0 +1,5 @@ +class RemoveRentalFields < ActiveRecord::Migration[6.0] + def change + remove_column :rentals, :check_out_date + end +end diff --git a/db/schema.rb b/db/schema.rb index 0fd2bab30..d4a2d67b8 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: 2020_05_29_163924) do +ActiveRecord::Schema.define(version: 2020_05_29_171449) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,7 +28,6 @@ end create_table "rentals", force: :cascade do |t| - t.date "check_out_date" t.date "check_in_date" t.date "due_date" t.datetime "created_at", precision: 6, null: false From 55e0325f74ed82bf1b043d2955c08759847e3008 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 10:39:22 -0700 Subject: [PATCH 29/45] added field video_count to customer --- .../20200529173714_add_column_video_count_to_customer.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200529173714_add_column_video_count_to_customer.rb diff --git a/db/migrate/20200529173714_add_column_video_count_to_customer.rb b/db/migrate/20200529173714_add_column_video_count_to_customer.rb new file mode 100644 index 000000000..a36a12041 --- /dev/null +++ b/db/migrate/20200529173714_add_column_video_count_to_customer.rb @@ -0,0 +1,5 @@ +class AddColumnVideoCountToCustomer < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index d4a2d67b8..80c822a44 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: 2020_05_29_171449) do +ActiveRecord::Schema.define(version: 2020_05_29_173714) 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", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count" end create_table "rentals", force: :cascade do |t| From 65311b474e7617038c7920797b62f7d9e761a452 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 10:47:55 -0700 Subject: [PATCH 30/45] reseeded db --- db/seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 2ea255387..06003891a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,5 @@ JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - customer['videos_checked_out_count'] = 1 + # customer['videos_checked_out_count'] = 1 Customer.create!(customer) end From a2b5206c366d4331d2a98d5c02e1647a692be232 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 11:09:11 -0700 Subject: [PATCH 31/45] basic rental model set up, woth validatin tests --- app/models/rental.rb | 6 +++- test/models/rental_test.rb | 57 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 0314055c4..1eaa9d831 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -5,8 +5,12 @@ class Rental < ApplicationRecord validates :video_id, presence: true validates :customer_id, presence: true - def due_date + def set_due_date return self.created_at + 1.week end + def set_check_in_date + check_in_date = DateTime.now + end + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..ef7d05a2c 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,58 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + before do + @rental = Rental.new(customer_id: 1, video_id: 2) + end + describe "valid creation" do + it "must have assigned fields" do + expect(@rental.customer_id).must_equal 1 + expect(@rental.video_id).must_equal 2 + end + + it "must be connected to customer" do + customer = Customer.create( + name: "Shelley Rocha", + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", + address: "Ap #292-5216 Ipsum Rd.", + city: "Hillsboro", + state: "OR", + postal_code: "24309", + phone: "(322) 510-8695", + videos_checked_out_count: 1 + ) + @rental.customer = customer + expect(@rental.customer.id).must_equal customer.id + end + + it "must be connected to video" do + video = Video.create( + title: "Rats and Birds And Strangers", + overview: "The childhood enemy claims the woman is heir to an incredible fortune, all paperwork has been taken care of already, all there's left to do is sign them. Distrustful of both this situation and of this childhood friend, the woman somewhat gladly agrees to the proposal, but there's no time to waste, a decision had to be made quickly.", + release_date: "2012-09-26", + total_inventory: 2, + available_inventory: 2 + ) + expect(@rental.video.id).must_equal video.id + end + + it "must be valid" do + result = @rental.valid? + expect(result).must_equal true + end + end + describe "presence validation" do + it "is invalid if customer_id is missing" do + @rental.customer_id = nil + result = @rental.valid? + expect(result).must_equal false + end + it "is invalid if video_id is missing" do + @rental.video_id = nil + result = @rental.valid? + expect(result).must_equal false + end + + end + end From 9b64c609aa497dd8e2af158cfd74bc59957bfae9 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 13:11:04 -0700 Subject: [PATCH 32/45] created testing fixtures for testing rental, updated rental tests. ALL PASSING --- test/fixtures/customer.yml | 9 +++++++ test/fixtures/rental.yml | 3 +++ test/fixtures/video.yml | 6 +++++ test/models/rental_test.rb | 49 +++++++++++++------------------------- 4 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 test/fixtures/customer.yml create mode 100644 test/fixtures/rental.yml create mode 100644 test/fixtures/video.yml diff --git a/test/fixtures/customer.yml b/test/fixtures/customer.yml new file mode 100644 index 000000000..5ea796ecf --- /dev/null +++ b/test/fixtures/customer.yml @@ -0,0 +1,9 @@ +customer_1: + name: "Shelley Rocha" + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700" + address: "Ap #292-5216 Ipsum Rd." + city: "Hillsboro" + state: "OR" + postal_code: "24309" + phone: "(322) 510-8695" + videos_checked_out_count: 1 \ No newline at end of file diff --git a/test/fixtures/rental.yml b/test/fixtures/rental.yml new file mode 100644 index 000000000..bb860f483 --- /dev/null +++ b/test/fixtures/rental.yml @@ -0,0 +1,3 @@ +rental_1: + customer: customer_1 + video: video_1 \ No newline at end of file diff --git a/test/fixtures/video.yml b/test/fixtures/video.yml new file mode 100644 index 000000000..51e7b58cf --- /dev/null +++ b/test/fixtures/video.yml @@ -0,0 +1,6 @@ +video_1: + title: "a" + overview: "this is a transformative movie" + release_date: "2020-01-01" + total_inventory: 20 + available_inventory: 19 \ No newline at end of file diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index ef7d05a2c..ba3401080 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,55 +1,40 @@ require "test_helper" describe Rental do - before do - @rental = Rental.new(customer_id: 1, video_id: 2) - end + let(:rental_fixture) {rental(:rental_1)} + let(:customer_fixture) {customer(:customer_1)} + let(:video_fixture) {video(:video_1)} + describe "valid creation" do it "must have assigned fields" do - expect(@rental.customer_id).must_equal 1 - expect(@rental.video_id).must_equal 2 + expect(rental_fixture.customer_id).must_equal customer_fixture.id + expect(rental_fixture.video_id).must_equal video_fixture.id end it "must be connected to customer" do - customer = Customer.create( - name: "Shelley Rocha", - registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", - address: "Ap #292-5216 Ipsum Rd.", - city: "Hillsboro", - state: "OR", - postal_code: "24309", - phone: "(322) 510-8695", - videos_checked_out_count: 1 - ) - @rental.customer = customer - expect(@rental.customer.id).must_equal customer.id + expect(rental_fixture.customer.id).must_equal customer_fixture.id end it "must be connected to video" do - video = Video.create( - title: "Rats and Birds And Strangers", - overview: "The childhood enemy claims the woman is heir to an incredible fortune, all paperwork has been taken care of already, all there's left to do is sign them. Distrustful of both this situation and of this childhood friend, the woman somewhat gladly agrees to the proposal, but there's no time to waste, a decision had to be made quickly.", - release_date: "2012-09-26", - total_inventory: 2, - available_inventory: 2 - ) - expect(@rental.video.id).must_equal video.id + expect(rental_fixture.video.id).must_equal video_fixture.id end - - it "must be valid" do - result = @rental.valid? + # it "must be valid" do + # value(rental_fixture).must_be :valid? + # end + it "must be valid" do + result = rental_fixture.valid? expect(result).must_equal true end end describe "presence validation" do it "is invalid if customer_id is missing" do - @rental.customer_id = nil - result = @rental.valid? + rental_fixture.customer_id = nil + result = rental_fixture.valid? expect(result).must_equal false end it "is invalid if video_id is missing" do - @rental.video_id = nil - result = @rental.valid? + rental_fixture.video_id = nil + result = rental_fixture.valid? expect(result).must_equal false end From 9635afb19936b351c6b50c5c3b8c3f30748c6e28 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 13:14:01 -0700 Subject: [PATCH 33/45] added relationship to rentals to video.rb, finished all model and controller testing of video --- app/controllers/videos_controller.rb | 2 +- app/models/video.rb | 1 + test/controllers/videos_controller_test.rb | 9 +++- test/models/video_test.rb | 62 ++++++++++++++++++++-- 4 files changed, 69 insertions(+), 5 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 0fceab784..4292ccc83 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -19,7 +19,7 @@ def create def show video = Video.find_by(id: params[:id]) if video - render json: video.as_json([:id, :title, :release_date, :available_inventory, :total_inventory]), status: :ok + render json: video.as_json(only: [:id, :title, :release_date, :available_inventory, :total_inventory]), status: :ok else render json: { ok: false, diff --git a/app/models/video.rb b/app/models/video.rb index 777455e5c..29e1f892e 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,4 +1,5 @@ class Video < ApplicationRecord + has_many :rentals validates :title, presence: true, length: { minimum: 1, maximum: 200 } validates :overview, presence: true, length: { minimum: 1, maximum: 1000 } validates :release_date, presence: true, format: { with: /\d{4}-\d{2}-\d{2}/, message: "must be in YYYY-MM-DD format"} diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index e677b9f4d..22c2f8561 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,6 +1,13 @@ require "test_helper" describe VideosController do + let(:video) { Video.new( + title: "a", + overview: "this is a transformative movie", + release_date: "2020-01-01", + total_inventory: 20, + available_inventory: 19 + ) } describe "video#index" do it "responds with success" do get videos_path @@ -20,7 +27,7 @@ video_attr = ["id", "title", "release_date", "available_inventory"] body.each do |video| expect(video).must_be_instance_of Hash - expect(pet.keys.sort).must_equal video_attr.sort + expect(video.keys.sort).must_equal video_attr.sort end end end diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..30b393412 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,63 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:video) { Video.new( + title: "a", + overview: "this is a transformative movie", + release_date: "2020-01-01", + total_inventory: 20, + available_inventory: 19 + ) } + describe "valid creation" do + it "must have assigned fields" do + expect(video.title).must_equal "a" + expect(video.overview).must_equal "this is a transformative movie" + expect(video.release_date).must_equal "2020-01-01" + expect(video.total_inventory).must_equal 20 + expect(video.available_inventory).must_equal 19 + end + + it "must be valid" do + result = video.valid? + expect(result).must_equal true + end + + it "can have rentals" do + rentals = [] + 3.times do |n| + rentals << Rental.create(customer_id: n, video_id: video.id) + end + video.rentals = rentals + expect(video.rentals[0].video_id).must_equal video.id + end + + end + describe "presence validation" do + it "is invalid if title is missing" do + video.title = nil + result = video.valid? + expect(result).must_equal false + end + it "is invalid if overview is missing" do + video.overview = nil + result = video.valid? + expect(result).must_equal false + end + it "is invalid if release_date is missing" do + video.release_date = nil + result = video.valid? + expect(result).must_equal false + end + it "is invalid if total_inventory is missing" do + video.total_inventory = nil + result = video.valid? + expect(result).must_equal false + end + it "is invalid if available_inventory is missing" do + video.available_inventory = nil + result = video.valid? + expect(result).must_equal false + end + end end + From f27f091015e1dd769a657a87dd64124652b6ceb1 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 13:58:21 -0700 Subject: [PATCH 34/45] added customer data --- test/fixtures/customers.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 test/fixtures/customers.yml diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..02a4b4746 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,36 @@ +Shelley: + name: Shelley Rocha, + registered_at: Wed, 29 Apr 2015 07:54:14 -0700, + address: Ap 292-5216 Ipsum Rd., + city: Hillsboro, + state: OR, + postal_code: 24309, + phone: (322) 510-8695 + videos_checked_out_count: 0 +Kenji: + name: Kenji Hamada + registered_at: Sat, 08 Jun 2019 08:31:10 -0700, + address: 41 Cape Andover, + city: Newport Beach, + state: CA, + postal_code: 92660, + phone: (310) 582-1982 + videos_checked_out_count: 4 +Chris: + name: Chris Davidson + registered_at: Wed, 01 Jun 2019 11:94:55 -0700, + address: 222 Jackson Street, + city: San Jose, + state: CA , + postal_code: 95112, + phone: (408) 783-2019 + videos_checked_out_count: 3 +Des: + name: Des de Leon + registered_at: Tues, 27 Nov 2018 24:56:04 -0700, + address: 219 Brannan St., + city: San Francisco + state: CA + postal_code: 94017, + phone: (415) 948-1115 + videos_checked_out_count: 7 \ No newline at end of file From 5870bb4bc3014f164ba78296b7eb4a574af597d9 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 14:03:38 -0700 Subject: [PATCH 35/45] updated customer list --- test/fixtures/customer.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/test/fixtures/customer.yml b/test/fixtures/customer.yml index 5ea796ecf..0d015d27b 100644 --- a/test/fixtures/customer.yml +++ b/test/fixtures/customer.yml @@ -6,4 +6,22 @@ customer_1: state: "OR" postal_code: "24309" phone: "(322) 510-8695" - videos_checked_out_count: 1 \ No newline at end of file + videos_checked_out_count: 1 +customer_2: + name: Kenji Hamada + registered_at: Sat, 08 Jun 2019 08:31:10 -0700, + address: 41 Cape Andover, + city: Newport Beach, + state: CA, + postal_code: 92660, + phone: (310) 582-1982 + videos_checked_out_count: 4 +customer_3: + name: Chris Davidson + registered_at: Wed, 01 Jun 2019 11:94:55 -0700, + address: 222 Jackson Street, + city: San Jose, + state: CA , + postal_code: 95112, + phone: (408) 783-2019 + videos_checked_out_count: 3 \ No newline at end of file From 32936ba5aeb9bb5589323c2aef434a306f9541d5 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 16:24:02 -0700 Subject: [PATCH 36/45] trying to pass tests --- app/controllers/rentals_controller.rb | 2 + config/routes.rb | 5 +- test/controllers/rentals_controller_test.rb | 96 +++++++++++++-------- 3 files changed, 67 insertions(+), 36 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d7dc96828..913b8342b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,9 @@ class RentalsController < ApplicationController def check_in + new_rental = Rental.find_by(id: params[:id]) + if new_rental.nil? render json: {ok: false, errors: "Not found"}, status: :not_found return diff --git a/config/routes.rb b/config/routes.rb index 224930986..53af3aee9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,9 @@ Rails.application.routes.draw do resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] - resources :rentals, only: [:create] + + post '/rentals/check-in', to: 'rentals#checkin', as: 'check_in' + post '/rentals/check-out', to: 'rentals#checkout', as: 'check_out' + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e849124d0..57ff20cbd 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,55 +1,81 @@ require "test_helper" describe RentalsController do - let(:rental_data) { - { - customer_id: customers(:one).id, - movie_id: movies(:one).id, - } - } + let(:rental_data){rental(:rental_1)} + let(:customer_fixture) {customer(:customer_1)} + let(:video_fixture) {video(:video_1)} - describe "check_out" do - it "should create a new rental check_out given valid data" do - current_checkouts = customers(:one).movies_checked_out_count - expect { - post new_check_out_path, params: rental_data - }.must_change "Rental.count", 1 + # let(:rental_data) { + # { + # customer_id: customer(:customer_1).id, + # video_id: video(:video_1).id, + # } + # } + + # let(:movie) { + # movies(:the_departed) + # } - customers(:one).reload - expect(customers(:one).movies_checked_out_count).must_equal 1 + describe "checkout" do + it "responds with success" do + expect(rental_data.customer.videos_checked_out_count).must_equal 1 + expect(rental_data.video.available_inventory).must_equal 19 - movies(:one).reload - inventory = movies(:one).inventory - expect(movies(:one).available_inventory).must_equal inventory - 1 + expect { + post check_out_path, params: rental_data + }.must_differ 'Rental.count', 1 body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "id" - expect(body).must_include "check_out" - expect(body).must_include "due_date" - rental = Rental.find(body["id"].to_i) - expect(rental.customer_id).must_equal rental_data[:customer_id] - expect(rental.movie_id).must_equal rental_data[:movie_id] + expect(body["id"]).must_be_instance_of Integer + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok - must_respond_with :success + # rental_data.customer.reload + # movie.reload + expect(customer.videos_checked_out_count).must_equal 1 + expect(movie.available_inventory).must_equal 24 end + end - it "returns an error for invalid rental data" do - expect { - post new_check_out_path - }.must_change "Rental.count", 0 + + # describe "create" do + # let(:rental_info) { + # { + # video_id: Video.first.id, + # customer_id: Customer.first.id + # } + # } + + # it "can creates a new rental" do + # expect { + # post rental_data, params: rental_info + # }.must_differ 'Rental.count', 1 + + # must_respond_with :created + # end + + # end + + + describe "checkin" do + it "responds with success when passed in valid params" do + + expect { + post check_in_path, params: rental_data + }.must_differ 'Rental.count', -1 body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "errors" - expect(body["errors"]).must_include "customer" - must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + + # customer.reload + # movie.reload + expect(rental_data.customer.videos_checked_out_count).must_equal 0 + expect(rental_data.available_inventory).must_equal 20 end end - - end From 515df339995307d04c2283b48e5e29a1a2560661 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 16:26:10 -0700 Subject: [PATCH 37/45] deleted old version of rentals_controller --- app/controllers/rentals_controller.rb | 52 --------------------------- 1 file changed, 52 deletions(-) delete mode 100644 app/controllers/rentals_controller.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb deleted file mode 100644 index d7dc96828..000000000 --- a/app/controllers/rentals_controller.rb +++ /dev/null @@ -1,52 +0,0 @@ -class RentalsController < ApplicationController - - def check_in - new_rental = Rental.find_by(id: params[:id]) - if new_rental.nil? - render json: {ok: false, errors: "Not found"}, status: :not_found - return - end - - new_rental.check_in = Time.now - new_rental.movie.available_inventory += 1 - - if new_rental.save && new_rental.movie.save - render json: new_rental.as_json(only: [:check_in]), status: :ok - return - else - render json: {ok: false, errors: new_rental.errors.messages}, status: :bad_request - return - end - end - - - def check_out - rental = Rental.new(rental_params) - rental.setup_dates - - if rental.valid? - if rental.movie.check_inventory - if rental.save - rental.movie.decrease_inventory - rental.customer.increase_movies_checkout - render json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok - return - else - render json: { ok: false, errors: "Error." }, status: :bad_request - return - end - else - render json: { ok: false, errors: "Video not found." }, status: :bad_request - end - else - render json: { ok: false, errors: rental.errors.messages }, status: :bad_request - end - - end - - - private - def rental_params - params.permit(:customer_id, :movie_id, :checkout, :check_in, :check_out, :due_date) - end -end From 2d49787a9e18cfb904a1dfc857a41b5714975f0f Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 18:32:09 -0700 Subject: [PATCH 38/45] dryed up code with model method calls --- app/controllers/rentals_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fa98e3070..4a301194e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,8 +7,7 @@ def check_in return end if rental.save - rental.set_check_in_date - rental.video.available_inventory += 1 + rental.check_in render json: rental.as_json(only: [:customer_id, :video_id]), status: :ok return else @@ -22,7 +21,6 @@ def check_out rental = Rental.new(rental_params) if rental.valid? if rental.video.available_inventory > 0 - rental.video.available_inventory -= 1 rental.check_out rental.save render json: rental.as_json(only: From d66aef311f80a5e94afbdef59d860dfc5c8de366 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 18:47:43 -0700 Subject: [PATCH 39/45] added columns/fields avail_inv and vid_checkout_out_count to rentals --- app/models/rental.rb | 4 ++-- ...21_add_videos_checked_out_and_available_inv_to_rental.rb | 6 ++++++ db/schema.rb | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20200530010621_add_videos_checked_out_and_available_inv_to_rental.rb diff --git a/app/models/rental.rb b/app/models/rental.rb index 496bcc735..b21a2358b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -27,13 +27,13 @@ def set_check_in_date end def restore_available_inventory self.video.checked_in - self.available_inventory = self.video.available_inventor + self.available_inventory = self.video.available_inventory end def restore_videos_checked_out_count self.customer.checked_in_video self.videos_checked_out_count = self.customer.videos_checked_out_count end - def checked_in + def check_in set_check_in_date restore_available_inventory restore_videos_checked_out_count diff --git a/db/migrate/20200530010621_add_videos_checked_out_and_available_inv_to_rental.rb b/db/migrate/20200530010621_add_videos_checked_out_and_available_inv_to_rental.rb new file mode 100644 index 000000000..95be2f521 --- /dev/null +++ b/db/migrate/20200530010621_add_videos_checked_out_and_available_inv_to_rental.rb @@ -0,0 +1,6 @@ +class AddVideosCheckedOutAndAvailableInvToRental < ActiveRecord::Migration[6.0] + def change + add_column :rentals, :videos_checked_out_count, :integer + add_column :rentals, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 80c822a44..09667865b 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: 2020_05_29_173714) do +ActiveRecord::Schema.define(version: 2020_05_30_010621) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,8 @@ t.datetime "updated_at", precision: 6, null: false t.bigint "video_id" t.bigint "customer_id" + t.integer "videos_checked_out_count" + t.integer "available_inventory" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["video_id"], name: "index_rentals_on_video_id" end From fe2a68d032cd30b46714d0588a910a18bf6691ab Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 18:49:22 -0700 Subject: [PATCH 40/45] removed require from strong params in video controller, changed test to reflect --- app/controllers/videos_controller.rb | 2 +- test/controllers/videos_controller_test.rb | 22 +++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 4292ccc83..2f723a653 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -30,6 +30,6 @@ def show private def video_params - return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 22c2f8561..a50a94496 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -33,28 +33,24 @@ end describe "video#create" do - let(:good_video_data) { - { - video: { + let(:good_video_data) { + { title: "Blacksmith Of The Banished", overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", release_date: "1979-01-18", total_inventory: 10, available_inventory: 9 - } } } let(:bad_video_data) { - { - video: { + { hello: "this is bad!", much: 5, ick: "not what I was expecting" } - } } - let(:empty_video_data) {{video:{}}} + # let(:empty_video_data) {{}} it "responds with success when sent good data, successfully created new video" do expect { @@ -67,11 +63,11 @@ post videos_path, params: bad_video_data must_respond_with :bad_request end - it "responds with failure when sent empty data set" do - expect{ - post videos_path, params: empty_video_data - }.must_raise ActionController::ParameterMissing - end + # it "responds with failure when sent empty data set" do + # expect{ + # post videos_path, params: empty_video_data + # }.must_raise ActionController::ParameterMissing + # end end From 066b1f4e2a12f4d099a663e40274aefd75e0ea53 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 18:50:26 -0700 Subject: [PATCH 41/45] fixed customer controller action typos for rental post routes --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 53af3aee9..fd23c557f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,8 +2,8 @@ resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] - post '/rentals/check-in', to: 'rentals#checkin', as: 'check_in' - post '/rentals/check-out', to: 'rentals#checkout', as: 'check_out' + post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' + post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From 9bab5122d58392123a552d5528f33352d021aa46 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 18:50:46 -0700 Subject: [PATCH 42/45] cleaned up tests --- test/controllers/rentals_controller_test.rb | 110 +++++++++++--------- test/fixtures/customer.yml | 1 + test/models/rental_test.rb | 4 +- 3 files changed, 63 insertions(+), 52 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 57ff20cbd..b0671f4c7 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,43 +1,55 @@ require "test_helper" describe RentalsController do - let(:rental_data){rental(:rental_1)} - let(:customer_fixture) {customer(:customer_1)} - let(:video_fixture) {video(:video_1)} - - - # let(:rental_data) { - # { - # customer_id: customer(:customer_1).id, - # video_id: video(:video_1).id, - # } - # } - - # let(:movie) { - # movies(:the_departed) - # } + let(:phony_customer) {Customer.create( + name: "Shelley Rocha", + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", + address: "Ap #292-5216 Ipsum Rd.", + city: "Hillsboro", + state: "OR", + postal_code: "24309", + phone: "(322) 510-8695", + videos_checked_out_count: 1 + )} + let(:phony_video) {Video.create( + title: "a", + overview: "this is a transformative movie", + release_date: "2020-01-01", + total_inventory: 20, + available_inventory: 19 + )} + let(:rental_fixture){rental(:rental_1)} + describe "checkout" do - it "responds with success" do - expect(rental_data.customer.videos_checked_out_count).must_equal 1 - expect(rental_data.video.available_inventory).must_equal 19 - - expect { - post check_out_path, params: rental_data - }.must_differ 'Rental.count', 1 - - body = JSON.parse(response.body) - - - expect(body["id"]).must_be_instance_of Integer - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok - - # rental_data.customer.reload - # movie.reload - expect(customer.videos_checked_out_count).must_equal 1 - expect(movie.available_inventory).must_equal 24 - end + let(:good_rental_data){ + { + customer_id: phony_customer.id, + video_id: phony_video.id + } + } + let(:bad_rental_data){ + { + customer_id: "horse", + video_id: "yaz" + } + } + + it "good data: responds with success, created new rental" do + expect { + post check_out_path, params: good_rental_data + }.must_differ 'Rental.count', 1 + must_respond_with :created + end + it "good data: correct http response" do + post check_out_path, params: good_rental_data + body = JSON.parse(response.body) + expect(response.header['Content-Type']).must_include 'json' + end + it "bad_data: responds with bad request" do + post check_out_path, params: bad_rental_data + must_respond_with :bad_request + end end @@ -61,21 +73,21 @@ # end - describe "checkin" do - it "responds with success when passed in valid params" do + # describe "checkin" do + # it "responds with success when passed in valid params" do - expect { - post check_in_path, params: rental_data - }.must_differ 'Rental.count', -1 - body = JSON.parse(response.body) + # expect { + # post check_in_path, params: rental_data + # }.must_differ 'Rental.count', -1 + # body = JSON.parse(response.body) - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok + # expect(response.header['Content-Type']).must_include 'json' + # must_respond_with :ok - # customer.reload - # movie.reload - expect(rental_data.customer.videos_checked_out_count).must_equal 0 - expect(rental_data.available_inventory).must_equal 20 - end - end + # # customer.reload + # # movie.reload + # expect(rental_data.customer.videos_checked_out_count).must_equal 0 + # expect(rental_data.available_inventory).must_equal 20 + # end + # end end diff --git a/test/fixtures/customer.yml b/test/fixtures/customer.yml index 0d015d27b..4557a1f4d 100644 --- a/test/fixtures/customer.yml +++ b/test/fixtures/customer.yml @@ -7,6 +7,7 @@ customer_1: postal_code: "24309" phone: "(322) 510-8695" videos_checked_out_count: 1 + customer_2: name: Kenji Hamada registered_at: Sat, 08 Jun 2019 08:31:10 -0700, diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index ba3401080..1cfd1b752 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -18,9 +18,7 @@ it "must be connected to video" do expect(rental_fixture.video.id).must_equal video_fixture.id end - # it "must be valid" do - # value(rental_fixture).must_be :valid? - # end + it "must be valid" do result = rental_fixture.valid? expect(result).must_equal true From c259a84da1505e794b0dcc5e28dd282a82612133 Mon Sep 17 00:00:00 2001 From: Yaz Date: Fri, 29 May 2020 19:51:32 -0700 Subject: [PATCH 43/45] added not_found responses for when video or customer not found in rental#check_in and rental#check_out. Wrote corresponding tests, passing --- app/controllers/rentals_controller.rb | 51 ++++--- test/controllers/rentals_controller_test.rb | 153 +++++++++----------- test/fixtures/rental.yml | 5 +- test/fixtures/video.yml | 8 +- 4 files changed, 105 insertions(+), 112 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4a301194e..079520fb0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,41 +1,40 @@ class RentalsController < ApplicationController def check_in - rental = Rental.find_by(id: params[:id]) - if rental.nil? - render json: {ok: false, errors: "Not found"}, status: :not_found + customer = Customer.find_by(id: rental_params[:customer_id]) + video = Video.find_by(id: rental_params[:video_id]) + if customer.nil? || video.nil? + render json: { ok: false, errors: "Customer or video not found" }, + status: :not_found return end - if rental.save - rental.check_in - render json: rental.as_json(only: [:customer_id, :video_id]), status: :ok - return - else - render json: {ok: false, errors: rental.errors.messages}, status: :bad_request - return - end + rental = Rental.find_by(customer_id: params[:customer_id]) + rental.save + rental.check_in + render json: rental.as_json(only: + [:customer_id, :video_id, :videos_checked_out_count, :available_inventory] + ), status: :ok end def check_out rental = Rental.new(rental_params) - if rental.valid? - if rental.video.available_inventory > 0 - rental.check_out - rental.save - render json: rental.as_json(only: - [:customer_id, :video_id, :due_date, :videos_checked_out_count, :available_inventory - ]), status: :created - return - else - render json: { ok: false, errors: "Video not available." }, status: :bad_request - return - end - else - render json: { ok: false, errors: rental.errors.messages }, status: :bad_request + customer = Customer.find_by(id: rental_params[:customer_id]) + video = Video.find_by(id: rental_params[:video_id]) + if customer.nil? || video.nil? + render json: { ok: false, errors: rental.errors.messages }, + status: :not_found + return + end + if video.available_inventory <= 0 + render json: { ok: false, errors: "Video not available." }, status: :bad_request return end - + rental.check_out + rental.save + render json: rental.as_json(only: + [:customer_id, :video_id, :due_date, :videos_checked_out_count, :available_inventory + ]), status: :created end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b0671f4c7..339ed51ca 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,93 +1,78 @@ require "test_helper" describe RentalsController do - let(:phony_customer) {Customer.create( - name: "Shelley Rocha", - registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", - address: "Ap #292-5216 Ipsum Rd.", - city: "Hillsboro", - state: "OR", - postal_code: "24309", - phone: "(322) 510-8695", - videos_checked_out_count: 1 - )} - let(:phony_video) {Video.create( - title: "a", - overview: "this is a transformative movie", - release_date: "2020-01-01", - total_inventory: 20, - available_inventory: 19 - )} - let(:rental_fixture){rental(:rental_1)} + let(:customer_fixture) {customer(:customer_1)} + let(:video_fixture) {video(:video_1)} + let(:rental_fixture1){rental(:rental_1)} + let(:not_avail_rental_fixture){rental(:rental_2)} + let(:good_rental_data){ + { + customer_id: customer_fixture.id, + video_id: video_fixture.id + } + } + let(:bad_rental_data1){ + { + customer_id: "horse", + video_id: 1 + } + } + let(:bad_rental_data2){ + { + customer_id: 1, + video_id: "horse" + } + } - - describe "checkout" do - let(:good_rental_data){ - { - customer_id: phony_customer.id, - video_id: phony_video.id - } - } - let(:bad_rental_data){ - { - customer_id: "horse", - video_id: "yaz" - } - } - - it "good data: responds with success, created new rental" do - expect { - post check_out_path, params: good_rental_data - }.must_differ 'Rental.count', 1 - must_respond_with :created - end - it "good data: correct http response" do + + describe "checkout" do + it "good data: responds with success, created new rental" do + expect { post check_out_path, params: good_rental_data - body = JSON.parse(response.body) - expect(response.header['Content-Type']).must_include 'json' - end - it "bad_data: responds with bad request" do - post check_out_path, params: bad_rental_data - must_respond_with :bad_request - end + }.must_differ 'Rental.count', 1 + must_respond_with :created + end + it "good data: correct http response" do + rental_attr = ["customer_id", "video_id", "due_date", "videos_checked_out_count", "available_inventory"] + post check_out_path, params: good_rental_data + body = JSON.parse(response.body) + expect(response.header['Content-Type']).must_include 'json' + expect(body.keys.sort).must_equal rental_attr.sort + end + it "bad_data: responds with not found when customer id bad" do + post check_out_path, params: bad_rental_data1 + must_respond_with :not_found + end + it "bad_data: responds with not found when video id bad" do + post check_out_path, params: bad_rental_data2 + must_respond_with :not_found + end + it "responds with bad_request when video not available" do + post check_in_path, params: not_avail_rental_fixture.as_json(only: [:customer_id, :video_id]) + end + end + describe "checkin" do + it "responds with success when passed in valid params" do + post check_in_path, params: rental_fixture1.as_json(only: [:customer_id, :video_id]) + must_respond_with :ok + end + it "good data: correct http response, expected data" do + rental_attr = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"] + post check_in_path, params: rental_fixture1.as_json(only: [:customer_id, :video_id]) + body = JSON.parse(response.body) + expect(response.header['Content-Type']).must_include 'json' + expect(body.keys.sort).must_equal rental_attr.sort + end + it "responds with bad request for bad customer data" do + post check_in_path, params: bad_rental_data1 + must_respond_with :not_found + end + it "responds with bad request for bad video data" do + post check_in_path, params: bad_rental_data2 + must_respond_with :not_found + end - - # describe "create" do - # let(:rental_info) { - # { - # video_id: Video.first.id, - # customer_id: Customer.first.id - # } - # } - - # it "can creates a new rental" do - # expect { - # post rental_data, params: rental_info - # }.must_differ 'Rental.count', 1 - - # must_respond_with :created - # end - - # end - - - # describe "checkin" do - # it "responds with success when passed in valid params" do - - # expect { - # post check_in_path, params: rental_data - # }.must_differ 'Rental.count', -1 - # body = JSON.parse(response.body) - - # expect(response.header['Content-Type']).must_include 'json' - # must_respond_with :ok - - # # customer.reload - # # movie.reload - # expect(rental_data.customer.videos_checked_out_count).must_equal 0 - # expect(rental_data.available_inventory).must_equal 20 - # end - # end + end end diff --git a/test/fixtures/rental.yml b/test/fixtures/rental.yml index bb860f483..cc23066d6 100644 --- a/test/fixtures/rental.yml +++ b/test/fixtures/rental.yml @@ -1,3 +1,6 @@ rental_1: customer: customer_1 - video: video_1 \ No newline at end of file + video: video_1 +rental_2: + customer: customer_1 + video: video_2 \ No newline at end of file diff --git a/test/fixtures/video.yml b/test/fixtures/video.yml index 51e7b58cf..f542802ec 100644 --- a/test/fixtures/video.yml +++ b/test/fixtures/video.yml @@ -3,4 +3,10 @@ video_1: overview: "this is a transformative movie" release_date: "2020-01-01" total_inventory: 20 - available_inventory: 19 \ No newline at end of file + available_inventory: 19 +video_2: + title: "b" + overview: "this is a transformative movie" + release_date: "2020-01-01" + total_inventory: 20 + available_inventory: 0 \ No newline at end of file From 03684a0864732a29da7c2886be010fd107989b55 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 29 May 2020 20:20:58 -0700 Subject: [PATCH 44/45] fixing smoke tests --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/customers_controller.rb | 3 +- app/controllers/rentals_controller.rb | 8 ++-- app/controllers/videos_controller.rb | 10 ++--- app/models/customer.rb | 2 + test/controllers/customers_controller_test.rb | 2 +- test/fixtures/customers.yml | 36 ------------------ 7 files changed, 12 insertions(+), 49 deletions(-) create mode 100644 .DS_Store delete mode 100644 test/fixtures/customers.yml diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1686b11df7c7a662b13e229ef725371bc8f548fa GIT binary patch literal 6148 zcmeHK%}T>S5Zp<%-ushE|~ih1ld z(zYu+(adXJR=1|zCK-r$ZABF9@HNKW6 z!i$nHll4@Mqk||3(snIvCP6Oab#ZC$c%lJyj2WlyNG?sotXmVE&O&w0URv$W*`1XY zG#8h*EhF!_YaSXe-6K@lrfDxcmm^%ik6!tahjZguNU8oBP0fh z0b=0KGoUv%qw?ohLJJ@Uh=K2B0QUzQ6w%RGD3n_VG!3xzNO z!c{7uO6B^A!Bsl=Z5`)mEEKAA#^uaVN6*al3x&(s!EeiO#vO&!5(C7*M+OE|*TVCE z Date: Fri, 29 May 2020 20:48:43 -0700 Subject: [PATCH 45/45] all smoke tests passing --- app/controllers/customers_controller.rb | 3 +-- app/controllers/rentals_controller.rb | 2 -- app/models/rental.rb | 4 +--- test/controllers/customers_controller_test.rb | 1 - test/controllers/rentals_controller_test.rb | 1 - test/controllers/videos_controller_test.rb | 2 -- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 688def7be..7bb10265c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,5 +3,4 @@ def index customers = Customer.order(:name).as_json(only: [:id, :name, :postal_code, :phone, :videos_checked_out_count, :registered_at]) render json: customers, status: :ok end -end - +end \ No newline at end of file diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e15185104..19b34e693 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -15,7 +15,6 @@ def check_in [:customer_id, :video_id, :videos_checked_out_count, :available_inventory] ), status: :ok end - def check_out rental = Rental.new(rental_params) @@ -37,7 +36,6 @@ def check_out ]), status: :ok end - private def rental_params params.permit(:customer_id, :video_id) diff --git a/app/models/rental.rb b/app/models/rental.rb index b21a2358b..a8e3966dc 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -39,6 +39,4 @@ def check_in restore_videos_checked_out_count end -end - - +end \ No newline at end of file diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 8938f9777..9520eeca4 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -13,7 +13,6 @@ must_respond_with :ok end - it "will respond with an empty array when there are no customers" do # Arrange Customer.destroy_all diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 339ed51ca..a23c5c2c9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -24,7 +24,6 @@ } } - describe "checkout" do it "good data: responds with success, created new rental" do expect { diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index a50a94496..138bf179b 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -50,8 +50,6 @@ } } - # let(:empty_video_data) {{}} - it "responds with success when sent good data, successfully created new video" do expect { post videos_path, params: good_video_data