From d2bd7b9d42c0da9b05472b0e25c6bc2080eb5c25 Mon Sep 17 00:00:00 2001 From: ChelseaC13 Date: Tue, 26 May 2020 11:38:53 -0700 Subject: [PATCH 01/16] api made and models generated --- .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/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 2 + app/models/video.rb | 2 + 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 | 9 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/migrate/20200526183502_create_videos.rb | 13 ++ db/migrate/20200526183806_create_customers.rb | 15 ++ 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/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 7 + test/models/video_test.rb | 7 + test/test_helper.rb | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 yarn.lock | 4 + 68 files changed, 1190 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/models/customer.rb create mode 100644 app/models/video.rb 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/migrate/20200526183502_create_videos.rb create mode 100644 db/migrate/20200526183806_create_customers.rb 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/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/models/customer_test.rb create mode 100644 test/models/video_test.rb 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..b585a3d2b --- /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', '>= 6.0.3.1' +# 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..41b7d4311 --- /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, >= 6.0.3.1) + 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/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/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..dc572b44b --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,2 @@ +class Video < ApplicationRecord +end 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..6117e2cfb --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +CoW3wgjmhOsBbzxokdxFDcH5xEi44oD7I9bG2Hp6GyWvFQCSpTBAEagIUe5VNz9r1iz8WX4Uo+fcXZ16m82ZJBzZQ/TCFxMK83Lfbh7R6QMBJKkaksinmKahTAmWeLB0fdpDYXaOc8aDlTwsa9NeyeHrhma07KIgfSdRy2M7c3s62YqKwTfSeFi6pxV47TxRLt/BVzRpQ6TJd9hGhNBwizLbw0iTVo5zGV1+ehEvmeIeZEJZCmyXyovAwvqOxSlPTFly00YfBjBrCxq3sElLAFG51V2Uhw1Dmt8q7730vIxRKxLC+vJMXkV7DNfPUlhM6zrLHoGAs05X1EFni9+sC+kmrWjhmNMLsLmEbiqc4y8ZfB/ibTjcxcE5dR8AkSaWg/5+V4OnCziTGEKCBgLW05nr1p0qQrV1z8L5--6Oao54/srJMUACSw--VPxbPjJYIbWJyoMSQ8+6bg== \ 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..fb97a1c85 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,9 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + + # resources :videos do + # resources :customers do + + # get "/zomg", to: " ", as: "zomg" + +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/migrate/20200526183502_create_videos.rb b/db/migrate/20200526183502_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20200526183502_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.date :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20200526183806_create_customers.rb b/db/migrate/20200526183806_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20200526183806_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 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..0f19eb7ab --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "darwin-x64-83", + "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/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/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 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 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 56807aee18a20a6fa72c24c6414d1872f73dddcf Mon Sep 17 00:00:00 2001 From: ChelseaC13 Date: Tue, 26 May 2020 19:35:17 -0700 Subject: [PATCH 02/16] rewind to original break off point --- app/controllers/customers_controller.rb | 8 + app/controllers/rentals_controller.rb | 2 + app/controllers/videos_controller.rb | 44 +++++ app/models/customer.rb | 7 + app/models/rental.rb | 4 + app/models/video.rb | 6 + config/routes.rb | 10 +- ...dd_videos_checked_out_count_to_customer.rb | 5 + db/migrate/20200526185235_create_rentals.rb | 9 + db/schema.rb | 31 ++- test/controllers/customers_controller_test.rb | 49 +++++ test/controllers/rentals_controller_test.rb | 7 + test/controllers/videos_controller_test.rb | 179 ++++++++++++++++++ test/fixtures/videos.yml | 20 ++ test/models/rental_test.rb | 7 + 15 files changed, 385 insertions(+), 3 deletions(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/controllers/videos_controller.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20200526184537_add_videos_checked_out_count_to_customer.rb create mode 100644 db/migrate/20200526185235_create_rentals.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/controllers/videos_controller_test.rb create mode 100644 test/fixtures/videos.yml create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..730624fe0 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,8 @@ +class CustomersController < ApplicationController + + def index + customers = Customer.all + render json: customers, status: :ok + end + +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..067c1172e --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,44 @@ +class VideosController < ApplicationController + + def index + videos = Video.all.as_json(only: [:available_inventory, :release_date, :title]) + render json: videos, status: :ok + end + + + def create + video = Video.new(video_params) + + if video.save + render json: video.as_json(only: [:id]), status: :created + return + else + render json: { + ok: false, + errors: video.errors.messages + }, status: :bad_request + return + end + end + + +def show + video = Video.find_by(id: params[:id]) + + if video + render json: video.as_json(only: [:title, :release_date, :available_inventory]) + return + else + render json: { ok: false, errors: ["Not Found"] }, status: :not_found + return + end + end + + + private + + def video_params + return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + end + +end \ No newline at end of file diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..9a0c03046 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,9 @@ class Customer < ApplicationRecord + has_many :rentals + + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..2420bf8cc --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :video + belongs_to :customer +end diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..9f0238540 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,8 @@ class Video < ApplicationRecord + has_many :rentals + + validates :title, presence: true + validates :release_date, presence: true + validates :available_inventory, presence: true + validates :total_inventory, presence:true, numericality: true end diff --git a/config/routes.rb b/config/routes.rb index fb97a1c85..c488c2fab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,14 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html - # resources :videos do - # resources :customers do + resources :videos, only: [:index, :create, :show] do + resources :rentals + end + resources :customers, only: [:index, :create, :show] do + resources :rentals + end + + resources :rentals, only: [:index, :create, :show] # get "/zomg", to: " ", as: "zomg" diff --git a/db/migrate/20200526184537_add_videos_checked_out_count_to_customer.rb b/db/migrate/20200526184537_add_videos_checked_out_count_to_customer.rb new file mode 100644 index 000000000..1280a012e --- /dev/null +++ b/db/migrate/20200526184537_add_videos_checked_out_count_to_customer.rb @@ -0,0 +1,5 @@ +class AddVideosCheckedOutCountToCustomer < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/migrate/20200526185235_create_rentals.rb b/db/migrate/20200526185235_create_rentals.rb new file mode 100644 index 000000000..40372753f --- /dev/null +++ b/db/migrate/20200526185235_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + t.string :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index b10373ba6..bd4ca75fb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,38 @@ # # 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_26_185235) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", 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| + t.string "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| + t.string "title" + t.string "overview" + t.date "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/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..ca7a0c651 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,49 @@ +require "test_helper" + +describe CustomersController do + + describe "index" 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 + + # Get the body of the response + 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_customer_attrs = ["id", "name", "registered_at", "postal_code", "phone", "videos_checked_out_count"] + + expect(customer.keys.sort).must_equal required_customer_attrs.sort + 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 [] + expect(status).must_equal 200 #added this + end + end + + + + +end 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 new file mode 100644 index 000000000..583d47ea5 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,179 @@ +require "test_helper" + +describe VideosController do + REQUIRED_video_FIELDS = ["title", "release_date", "available_inventory"].sort + describe "index" do + it "responds with JSON and success" do + get videos_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end + + it "responds with an array of video hashes" do + # Act + get videos_path + + # Get the body of the response + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + body.each do |video| + expect(video).must_be_instance_of Hash + + required_video_attrs = ["title", "release_date", "available_inventory"] + + expect(video.keys.sort).must_equal required_video_attrs.sort + end + end + + it "will respond with an empty array when there are no videos" do + # Arrange + Video.destroy_all + + # Act + get customers_path + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + expect(body).must_equal [] + expect(status).must_equal 200 #added this + end + end + + + describe "create" do + let(:video_data) { + { + video: { + title: "my movie", + release_date: "2020", + available_inventory: 3 + } + } + } + + + it "can create a new video" do + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 1 + + check_response(expected_type: Hash, expected_status: :created) + end + + it "will respond with bad_request for invalid data" do + video[:video][:title] = nil + + expect { + # Act + post videos_path, params: video_data + + # Assert + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "title" + end + + end + + describe "show" do + it "responds with JSON and success and correct video data" do + video = Video.first + + gets video_path(video.id) + + body = check_response(expected_type: Hash) + + + expect(body.keys.sort).must_equal REQUIRED_video_FIELDS + expect(body["id"]).must_equal existing_video.id + expect(body["title"]).must_equal existing_video.title + expect(body["release_date"]).must_equal existing_video.release_date + expect(body["available_inventory"]).must_equal existing_video.available_inventory + puts "this is the body #{body}" + end + + it "responds with JSON, not found, and errors when looking for non-extant pet" do + get video_path(-1) + + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body["ok"]).must_equal false + expect(body["errors"]).must_include "Not Found" + end + end +end + + + +# describe PetsController do + +# REQUIRED_PET_FIELDS = ["id", "name", "species", "age", "owner"].sort + +# def check_response(expected_type:, expected_status: :success) +# must_respond_with expected_status +# expect(response.header['Content-Type']).must_include 'json' + +# body = JSON.parse(response.body) +# expect(body).must_be_kind_of expected_type +# return body +# end + + +# describe "create" do +# let(:pet_data) { +# { +# pet: { +# name: "Stinker", +# species: "Dog", +# age: 13, +# owner: "Grace" +# } +# } +# } + +# it "can create a new pet" do +# expect { +# post pets_path, params: pet_data +# }.must_differ "Pet.count", 1 + +# check_response(expected_type: Hash, expected_status: :created) +# end + +# it "will respond with bad_request for invalid data" do +# # Arrange - using let from above +# # Our PetsController test should just test generically +# # for any kind of invalid data, so we will randomly pick +# # the age attribute to invalidate +# pet_data[:pet][:age] = nil + +# expect { +# # Act +# post pets_path, params: pet_data + +# # Assert +# }.wont_change "Pet.count" + +# body = check_response(expected_type: Hash, expected_status: :bad_request) +# expect(body["errors"].keys).must_include "age" +# end + +# end + +# describe "show" do + + +# it "responds with JSON, not found, and errors when looking for non-extant pet" do +# get pet_path(-1) + +# body = check_response(expected_type: Hash, expected_status: :not_found) +# expect(body["ok"]).must_equal false +# expect(body["errors"]).must_include "Not Found" +# end +# end + +# end + diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..9a589adcb --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,20 @@ +valid_video1: + title: "my title" + release_date: "yesterday" + available_inventory: 10 + +valid_video2: + title: "another title" + release_date: "2018" + available_inventory: 9 + +valid_video3: + title: "random" + release_date: "2017" + available_inventory: 8 + +valid_video4: + title: "another random" + release_date: "2010" + available_inventory: 7 + \ No newline at end of file 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 84c62ddcbcfa8d4f4cda939db7e3cf27a6ee0c9d Mon Sep 17 00:00:00 2001 From: ChelseaC13 Date: Tue, 26 May 2020 22:07:04 -0700 Subject: [PATCH 03/16] video tests for controller passing --- app/controllers/videos_controller.rb | 6 +- app/models/video.rb | 2 +- test/controllers/videos_controller_test.rb | 67 +++++++++++++--------- test/fixtures/videos.yml | 16 +++--- 4 files changed, 52 insertions(+), 39 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 067c1172e..577a594ba 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,7 @@ class VideosController < ApplicationController def index - videos = Video.all.as_json(only: [:available_inventory, :release_date, :title]) + videos = Video.all.as_json(only: [:id, :available_inventory, :release_date, :title]) render json: videos, status: :ok end @@ -26,7 +26,7 @@ def show video = Video.find_by(id: params[:id]) if video - render json: video.as_json(only: [:title, :release_date, :available_inventory]) + render json: video.as_json(only: [:id, :title, :release_date, :available_inventory]) return else render json: { ok: false, errors: ["Not Found"] }, status: :not_found @@ -38,7 +38,7 @@ def show private def video_params - return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + return params.require(:video).permit(:title, :release_date, :available_inventory) end end \ No newline at end of file diff --git a/app/models/video.rb b/app/models/video.rb index 9f0238540..2439823ae 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -4,5 +4,5 @@ class Video < ApplicationRecord validates :title, presence: true validates :release_date, presence: true validates :available_inventory, presence: true - validates :total_inventory, presence:true, numericality: true + # validates :total_inventory, presence:true, numericality: true end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 583d47ea5..a2bec5114 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,18 @@ require "test_helper" +def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body +end + describe VideosController do - REQUIRED_video_FIELDS = ["title", "release_date", "available_inventory"].sort + REQUIRED_video_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + + describe "index" do it "responds with JSON and success" do get videos_path @@ -22,7 +33,7 @@ body.each do |video| expect(video).must_be_instance_of Hash - required_video_attrs = ["title", "release_date", "available_inventory"] + required_video_attrs = ["id","title", "release_date", "available_inventory"] expect(video.keys.sort).must_equal required_video_attrs.sort end @@ -46,17 +57,17 @@ describe "create" do let(:video_data) { - { - video: { - title: "my movie", - release_date: "2020", - available_inventory: 3 - } - } - } - - - it "can create a new video" do + { + video: { + title: "new title", + release_date: Time.now, + available_inventory: 9, + } + } + } + + + it "can create a new pet" do expect { post videos_path, params: video_data }.must_differ "Video.count", 1 @@ -65,7 +76,11 @@ end it "will respond with bad_request for invalid data" do - video[:video][:title] = nil + # Arrange - using let from above + # Our videosController test should just test generically + # for any kind of invalid data, so we will randomly pick + # the age attribute to invalidate + video_data[:video][:available_inventory] = nil expect { # Act @@ -75,29 +90,27 @@ }.wont_change "Video.count" body = check_response(expected_type: Hash, expected_status: :bad_request) - expect(body["errors"].keys).must_include "title" + expect(body["errors"].keys).must_include "available_inventory" end end describe "show" do it "responds with JSON and success and correct video data" do - video = Video.first + videos = Video.all + video = videos.first - gets video_path(video.id) - + get video_path(video.id) body = check_response(expected_type: Hash) - - expect(body.keys.sort).must_equal REQUIRED_video_FIELDS - expect(body["id"]).must_equal existing_video.id - expect(body["title"]).must_equal existing_video.title - expect(body["release_date"]).must_equal existing_video.release_date - expect(body["available_inventory"]).must_equal existing_video.available_inventory - puts "this is the body #{body}" + expect(body.keys.sort).must_equal REQUIRED_video_FIELDS.sort + expect(body["id"]).must_equal video.id + expect(body["title"]).must_equal video.title + expect(body["release_date"]).must_equal "1979-01-18" + expect(body["available_inventory"]).must_equal video.available_inventory end - it "responds with JSON, not found, and errors when looking for non-extant pet" do + it "responds with JSON, not found, and errors when looking for non-extant video" do get video_path(-1) body = check_response(expected_type: Hash, expected_status: :not_found) @@ -109,7 +122,7 @@ -# describe PetsController do +# describe videosController do # REQUIRED_PET_FIELDS = ["id", "name", "species", "age", "owner"].sort diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 9a589adcb..0cfeb0a19 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -1,20 +1,20 @@ -valid_video1: +video: title: "my title" - release_date: "yesterday" + release_date: Date.new(Thu, 18 Jan 1979) available_inventory: 10 -valid_video2: +video2: title: "another title" - release_date: "2018" + release_date: Date.new(Thu, 18 Jan 1979) available_inventory: 9 -valid_video3: +video3: title: "random" - release_date: "2017" + release_date: Date.new(Thu, 18 Jan 1979) available_inventory: 8 -valid_video4: +video4: title: "another random" - release_date: "2010" + release_date: Date.new(Thu, 18 Jan 1979) available_inventory: 7 \ No newline at end of file From ee609a35cfedc0c17e1657f191a2442f0e9c0555 Mon Sep 17 00:00:00 2001 From: ChelseaC13 Date: Tue, 26 May 2020 22:39:05 -0700 Subject: [PATCH 04/16] adding atributes to video controller tests, also the controller is commented out --- app/controllers/customers_controller.rb | 49 +++++- app/controllers/videos_controller.rb | 6 +- test/controllers/customers_controller_test.rb | 143 +++++++++++++----- test/controllers/videos_controller_test.rb | 85 ++--------- test/fixtures/customers.yml | 6 + test/fixtures/videos.yml | 13 +- 6 files changed, 181 insertions(+), 121 deletions(-) create mode 100644 test/fixtures/customers.yml diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 730624fe0..98d81fdac 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,47 @@ class CustomersController < ApplicationController - def index - customers = Customer.all - render json: customers, status: :ok - end -end + def index +# videos = Video.all.as_json(only: [:id, :name, :regis, :title]) +# render json: videos, status: :ok + end + + +# def create +# video = Video.new(video_params) + +# if video.save +# render json: video.as_json(only: [:id]), status: :created +# return +# else +# render json: { +# ok: false, +# errors: video.errors.messages +# }, status: :bad_request +# return +# end +# end + + +# def show +# video = Video.find_by(id: params[:id]) + +# if video +# render json: video.as_json(only: [:id, :title, :release_date, :available_inventory]) +# return +# else +# render json: { ok: false, errors: ["Not Found"] }, status: :not_found +# return +# end +# end + + +# private + +# def video_params +# return params.require(:video).permit(:title, :release_date, :available_inventory) +# end + +# end + + end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 577a594ba..d81a94cdd 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,7 @@ class VideosController < ApplicationController def index - videos = Video.all.as_json(only: [:id, :available_inventory, :release_date, :title]) + videos = Video.all.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]) render json: videos, status: :ok end @@ -26,7 +26,7 @@ def show video = Video.find_by(id: params[:id]) if video - render json: video.as_json(only: [:id, :title, :release_date, :available_inventory]) + render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]) return else render json: { ok: false, errors: ["Not Found"] }, status: :not_found @@ -38,7 +38,7 @@ def show private def video_params - return params.require(:video).permit(:title, :release_date, :available_inventory) + return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) 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 ca7a0c651..9b7cd4506 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,49 +1,122 @@ -require "test_helper" +# require "test_helper" +# def check_response(expected_type:, expected_status: :success) +# must_respond_with expected_status +# expect(response.header['Content-Type']).must_include 'json' -describe CustomersController do +# body = JSON.parse(response.body) +# expect(body).must_be_kind_of expected_type +# return body +# end - describe "index" do - it "responds with JSON and success" do - get customers_path +# describe CustomersController do - expect(response.header['Content-Type']).must_include 'json' - must_respond_with :ok - end +# REQUIRED_video_FIELDS = ["id", "name", "registered_at", "available_inventory"].sort - it "responds with an array of customer hashes" do - # Act - get customers_path + +# describe "index" do +# it "responds with JSON and success" do +# get videos_path + +# expect(response.header['Content-Type']).must_include 'json' +# must_respond_with :ok +# end + +# it "responds with an array of video hashes" do +# # Act +# get videos_path - # Get the body of the response - body = JSON.parse(response.body) +# # Get the body of the response +# body = JSON.parse(response.body) - # Assert - expect(body).must_be_instance_of Array - body.each do |customer| - expect(customer).must_be_instance_of Hash +# # Assert +# expect(body).must_be_instance_of Array +# body.each do |video| +# expect(video).must_be_instance_of Hash - required_customer_attrs = ["id", "name", "registered_at", "postal_code", "phone", "videos_checked_out_count"] +# required_video_attrs = ["id","title", "release_date", "available_inventory"] - expect(customer.keys.sort).must_equal required_customer_attrs.sort - end - end +# expect(video.keys.sort).must_equal required_video_attrs.sort +# end +# end - it "will respond with an empty array when there are no customers" do - # Arrange - Customer.destroy_all +# it "will respond with an empty array when there are no videos" do +# # Arrange +# Video.destroy_all - # Act - get customers_path - body = JSON.parse(response.body) +# # Act +# get customers_path +# body = JSON.parse(response.body) - # Assert - expect(body).must_be_instance_of Array - expect(body).must_equal [] - expect(status).must_equal 200 #added this - end - end +# # Assert +# expect(body).must_be_instance_of Array +# expect(body).must_equal [] +# expect(status).must_equal 200 #added this +# end +# end - +# describe "create" do +# let(:video_data) { +# { +# video: { +# title: "new title", +# release_date: Time.now, +# available_inventory: 9, +# } +# } +# } + + +# it "can create a new pet" do +# expect { +# post videos_path, params: video_data +# }.must_differ "Video.count", 1 + +# check_response(expected_type: Hash, expected_status: :created) +# end + +# it "will respond with bad_request for invalid data" do +# # Arrange - using let from above +# # Our videosController test should just test generically +# # for any kind of invalid data, so we will randomly pick +# # the age attribute to invalidate +# video_data[:video][:available_inventory] = nil + +# expect { +# # Act +# post videos_path, params: video_data + +# # Assert +# }.wont_change "Video.count" + +# body = check_response(expected_type: Hash, expected_status: :bad_request) +# expect(body["errors"].keys).must_include "available_inventory" +# end + +# end + +# describe "show" do +# it "responds with JSON and success and correct video data" do +# videos = Video.all +# video = videos.first + +# get video_path(video.id) +# body = check_response(expected_type: Hash) + +# expect(body.keys.sort).must_equal REQUIRED_video_FIELDS.sort +# expect(body["id"]).must_equal video.id +# expect(body["title"]).must_equal video.title +# expect(body["release_date"]).must_equal "1979-01-18" +# expect(body["available_inventory"]).must_equal video.available_inventory +# end + +# it "responds with JSON, not found, and errors when looking for non-extant video" do +# get video_path(-1) + +# body = check_response(expected_type: Hash, expected_status: :not_found) +# expect(body["ok"]).must_equal false +# expect(body["errors"]).must_include "Not Found" +# end +# end -end +#end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index a2bec5114..d27bc30bc 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -10,7 +10,7 @@ def check_response(expected_type:, expected_status: :success) end describe VideosController do - REQUIRED_video_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + REQUIRED_video_FIELDS = ["id", "title", "overview","release_date", "total_inventory","available_inventory"].sort describe "index" do @@ -33,7 +33,7 @@ def check_response(expected_type:, expected_status: :success) body.each do |video| expect(video).must_be_instance_of Hash - required_video_attrs = ["id","title", "release_date", "available_inventory"] + required_video_attrs = ["id","title", "overview", "release_date", "total_inventory","available_inventory"] expect(video.keys.sort).must_equal required_video_attrs.sort end @@ -44,13 +44,13 @@ def check_response(expected_type:, expected_status: :success) Video.destroy_all # Act - get customers_path + get videos_path body = JSON.parse(response.body) - + # Assert expect(body).must_be_instance_of Array expect(body).must_equal [] - expect(status).must_equal 200 #added this + expect(status).must_equal 200 end end @@ -60,8 +60,10 @@ def check_response(expected_type:, expected_status: :success) { video: { title: "new title", + overview: "some overview", release_date: Time.now, - available_inventory: 9, + total_inventroy: 3, + available_inventory: 9 } } } @@ -108,6 +110,8 @@ def check_response(expected_type:, expected_status: :success) expect(body["title"]).must_equal video.title expect(body["release_date"]).must_equal "1979-01-18" expect(body["available_inventory"]).must_equal video.available_inventory + expect(body["total_inventory"]).must_equal video.total_inventory + expect(body["overview"]).must_equal video.overview end it "responds with JSON, not found, and errors when looking for non-extant video" do @@ -121,72 +125,3 @@ def check_response(expected_type:, expected_status: :success) end - -# describe videosController do - -# REQUIRED_PET_FIELDS = ["id", "name", "species", "age", "owner"].sort - -# def check_response(expected_type:, expected_status: :success) -# must_respond_with expected_status -# expect(response.header['Content-Type']).must_include 'json' - -# body = JSON.parse(response.body) -# expect(body).must_be_kind_of expected_type -# return body -# end - - -# describe "create" do -# let(:pet_data) { -# { -# pet: { -# name: "Stinker", -# species: "Dog", -# age: 13, -# owner: "Grace" -# } -# } -# } - -# it "can create a new pet" do -# expect { -# post pets_path, params: pet_data -# }.must_differ "Pet.count", 1 - -# check_response(expected_type: Hash, expected_status: :created) -# end - -# it "will respond with bad_request for invalid data" do -# # Arrange - using let from above -# # Our PetsController test should just test generically -# # for any kind of invalid data, so we will randomly pick -# # the age attribute to invalidate -# pet_data[:pet][:age] = nil - -# expect { -# # Act -# post pets_path, params: pet_data - -# # Assert -# }.wont_change "Pet.count" - -# body = check_response(expected_type: Hash, expected_status: :bad_request) -# expect(body["errors"].keys).must_include "age" -# end - -# end - -# describe "show" do - - -# it "responds with JSON, not found, and errors when looking for non-extant pet" do -# get pet_path(-1) - -# body = check_response(expected_type: Hash, expected_status: :not_found) -# expect(body["ok"]).must_equal false -# expect(body["errors"]).must_include "Not Found" -# end -# end - -# end - diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..ca7f123e5 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,6 @@ +# customer: +# name: "my title" +# registered_at: Date.new(Thu, 18 Jan 1979) +# address: 10 +# city: +# state: diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 0cfeb0a19..f0c0de0cd 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -1,20 +1,27 @@ video: title: "my title" + overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life." release_date: Date.new(Thu, 18 Jan 1979) + total_inventory: 15 available_inventory: 10 - + video2: title: "another title" + overview: "The strange woman claims the boy has a DNA strain which very likely offers the key to cure several crippling diseases. Tests will have to be done, but the key to save millions of lives is within the grasp of science through this DNA strain. Unsure what to think of all this and of this strange woman, the boy hesitantly agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made." release_date: Date.new(Thu, 18 Jan 1979) + total_inventory: 3 available_inventory: 9 video3: title: "random" + overview: "But what if this strange woman is a con artist. Or what if everything told is completely true. How could an ordinary boy be relied upon in something this big. Time will tell." release_date: Date.new(Thu, 18 Jan 1979) + total_inventory: 12 available_inventory: 8 video4: title: "another random" + overview: "The laid-back life of a woman is going in a different direction as a childhood friend enters her life." release_date: Date.new(Thu, 18 Jan 1979) - available_inventory: 7 - \ No newline at end of file + total_inventory: 12 + available_inventory: 7 \ No newline at end of file From c98302725b5f19ea42ce19b9ac56308ecd6cd513 Mon Sep 17 00:00:00 2001 From: ChelseaC13 Date: Tue, 26 May 2020 22:55:01 -0700 Subject: [PATCH 05/16] wave one done except for validations tests --- app/controllers/customers_controller.rb | 68 ++++---- test/controllers/customers_controller_test.rb | 145 ++++-------------- test/fixtures/customers.yml | 23 ++- test/fixtures/videos.yml | 1 + 4 files changed, 85 insertions(+), 152 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 98d81fdac..0759194eb 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,46 +2,44 @@ class CustomersController < ApplicationController def index -# videos = Video.all.as_json(only: [:id, :name, :regis, :title]) -# render json: videos, status: :ok + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) # TODO Videos checked out + render json: customers, status: :ok end -# def create -# video = Video.new(video_params) - -# if video.save -# render json: video.as_json(only: [:id]), status: :created -# return -# else -# render json: { -# ok: false, -# errors: video.errors.messages -# }, status: :bad_request -# return -# end -# end - - -# def show -# video = Video.find_by(id: params[:id]) - -# if video -# render json: video.as_json(only: [:id, :title, :release_date, :available_inventory]) -# return -# else -# render json: { ok: false, errors: ["Not Found"] }, status: :not_found -# return -# end -# end - + def create + customer = Customer.new(customer_params) + + if customer.save + render json: customer.as_json(only: [:id]), status: :created + return + else + render json: { + ok: false, + errors: customer.errors.messages + }, status: :bad_request + return + end + end -# private -# def video_params -# return params.require(:video).permit(:title, :release_date, :available_inventory) -# end + def show + customer = Customer.find_by(id: params[:id]) -# end + if customer + render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + return + else + render json: { ok: false, errors: ["Not Found"] }, status: :not_found + return + end + end + + + private + + def customer_params + return params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 9b7cd4506..0d8a84377 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,122 +1,45 @@ -# require "test_helper" -# def check_response(expected_type:, expected_status: :success) -# must_respond_with expected_status -# expect(response.header['Content-Type']).must_include 'json' +require "test_helper" -# body = JSON.parse(response.body) -# expect(body).must_be_kind_of expected_type -# return body -# end +describe CustomersController do -# describe CustomersController do + describe "index" do + it "responds with JSON and success" do + get customers_path -# REQUIRED_video_FIELDS = ["id", "name", "registered_at", "available_inventory"].sort + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :ok + end - -# describe "index" do -# it "responds with JSON and success" do -# get videos_path - -# expect(response.header['Content-Type']).must_include 'json' -# must_respond_with :ok -# end - -# it "responds with an array of video hashes" do -# # Act -# get videos_path + it "responds with an array of customer hashes" do + # Act + get customers_path -# # Get the body of the response -# body = JSON.parse(response.body) + # Get the body of the response + body = JSON.parse(response.body) -# # Assert -# expect(body).must_be_instance_of Array -# body.each do |video| -# expect(video).must_be_instance_of Hash + # Assert + expect(body).must_be_instance_of Array + body.each do |customer| + expect(customer).must_be_instance_of Hash -# required_video_attrs = ["id","title", "release_date", "available_inventory"] + required_customer_attrs = ["id", "name", "registered_at", "postal_code", "phone"] -# expect(video.keys.sort).must_equal required_video_attrs.sort -# end -# end + expect(customer.keys.sort).must_equal required_customer_attrs.sort + end + end -# it "will respond with an empty array when there are no videos" do -# # Arrange -# Video.destroy_all + 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) + # Act + get customers_path + body = JSON.parse(response.body) -# # Assert -# expect(body).must_be_instance_of Array -# expect(body).must_equal [] -# expect(status).must_equal 200 #added this -# end -# end - - -# describe "create" do -# let(:video_data) { -# { -# video: { -# title: "new title", -# release_date: Time.now, -# available_inventory: 9, -# } -# } -# } - - -# it "can create a new pet" do -# expect { -# post videos_path, params: video_data -# }.must_differ "Video.count", 1 - -# check_response(expected_type: Hash, expected_status: :created) -# end - -# it "will respond with bad_request for invalid data" do -# # Arrange - using let from above -# # Our videosController test should just test generically -# # for any kind of invalid data, so we will randomly pick -# # the age attribute to invalidate -# video_data[:video][:available_inventory] = nil - -# expect { -# # Act -# post videos_path, params: video_data - -# # Assert -# }.wont_change "Video.count" - -# body = check_response(expected_type: Hash, expected_status: :bad_request) -# expect(body["errors"].keys).must_include "available_inventory" -# end - -# end - -# describe "show" do -# it "responds with JSON and success and correct video data" do -# videos = Video.all -# video = videos.first - -# get video_path(video.id) -# body = check_response(expected_type: Hash) - -# expect(body.keys.sort).must_equal REQUIRED_video_FIELDS.sort -# expect(body["id"]).must_equal video.id -# expect(body["title"]).must_equal video.title -# expect(body["release_date"]).must_equal "1979-01-18" -# expect(body["available_inventory"]).must_equal video.available_inventory -# end - -# it "responds with JSON, not found, and errors when looking for non-extant video" do -# get video_path(-1) - -# body = check_response(expected_type: Hash, expected_status: :not_found) -# expect(body["ok"]).must_equal false -# expect(body["errors"]).must_include "Not Found" -# end -# end - -#end + # Assert + expect(body).must_be_instance_of Array + expect(body).must_equal [] + expect(status).must_equal 200 #added this + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index ca7f123e5..653e18862 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,6 +1,17 @@ -# customer: -# name: "my title" -# registered_at: Date.new(Thu, 18 Jan 1979) -# address: 10 -# city: -# state: +customer: + 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" + +customer1: + name: "Roanna Robinson" + registered_at: "Fri, 28 Nov 2014 13:14:08 -0800" + address: "Ap #561-4214 Eget St." + city: "Harrisburg" + state: "PA" + postal_code: "15867" + phone: "(323) 336-1841" diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index f0c0de0cd..a6099a175 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -4,6 +4,7 @@ video: release_date: Date.new(Thu, 18 Jan 1979) total_inventory: 15 available_inventory: 10 + #TODO add video checked out count video2: title: "another title" From 5778b05ce0283d5de1fdb45cd3fb2b28e94bc987 Mon Sep 17 00:00:00 2001 From: ChelseaC13 Date: Wed, 27 May 2020 12:43:58 -0700 Subject: [PATCH 06/16] done with wave 1 validation tests --- app/controllers/videos_controller.rb | 3 +-- app/models/video.rb | 5 ++-- test/VideoStoreAPI.postman_environment.json | 14 +++++++++++ test/controllers/videos_controller_test.rb | 17 ++++++-------- test/fixtures/videos.yml | 13 ++++++++--- test/models/video_test.rb | 26 ++++++++++++++++++--- 6 files changed, 58 insertions(+), 20 deletions(-) create mode 100644 test/VideoStoreAPI.postman_environment.json diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index d81a94cdd..4767bdbc9 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -8,7 +8,6 @@ def index def create video = Video.new(video_params) - if video.save render json: video.as_json(only: [:id]), status: :created return @@ -38,7 +37,7 @@ 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 \ No newline at end of file diff --git a/app/models/video.rb b/app/models/video.rb index 2439823ae..e9d8ca13f 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -3,6 +3,7 @@ class Video < ApplicationRecord validates :title, presence: true validates :release_date, presence: true - validates :available_inventory, presence: true - # validates :total_inventory, presence:true, numericality: true + validates :available_inventory, presence: true, numericality: { only_integer: true } + validates :total_inventory, presence:true, numericality: true + #TODO double check that total inventory validations are made end diff --git a/test/VideoStoreAPI.postman_environment.json b/test/VideoStoreAPI.postman_environment.json new file mode 100644 index 000000000..c61694ca6 --- /dev/null +++ b/test/VideoStoreAPI.postman_environment.json @@ -0,0 +1,14 @@ +{ + "id": "fea67a04-e949-45cc-8b9b-26ae631dcc1f", + "name": "VideoStoreAPI", + "values": [ + { + "key": "base_url", + "value": "http://localhost:3000", + "enabled": true + } + ], + "_postman_variable_scope": "environment", + "_postman_exported_at": "2020-05-27T19:15:52.208Z", + "_postman_exported_using": "Postman/7.23.0" +} \ No newline at end of file diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index d27bc30bc..78272920e 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -58,18 +58,15 @@ def check_response(expected_type:, expected_status: :success) describe "create" do let(:video_data) { { - video: { - title: "new title", - overview: "some overview", - release_date: Time.now, - total_inventroy: 3, - available_inventory: 9 - } + title: "new title", + overview: "some overview", + release_date: Time.now, + total_inventory: 3, + available_inventory: 9 } } - - it "can create a new pet" do + it "can create a new video" do expect { post videos_path, params: video_data }.must_differ "Video.count", 1 @@ -82,7 +79,7 @@ def check_response(expected_type:, expected_status: :success) # Our videosController test should just test generically # for any kind of invalid data, so we will randomly pick # the age attribute to invalidate - video_data[:video][:available_inventory] = nil + video_data[:available_inventory] = nil expect { # Act diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index a6099a175..f0fb6bf50 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -2,8 +2,8 @@ video: title: "my title" overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life." release_date: Date.new(Thu, 18 Jan 1979) - total_inventory: 15 - available_inventory: 10 + total_inventory: nil + available_inventory: nil #TODO add video checked out count video2: @@ -25,4 +25,11 @@ video4: overview: "The laid-back life of a woman is going in a different direction as a childhood friend enters her life." release_date: Date.new(Thu, 18 Jan 1979) total_inventory: 12 - available_inventory: 7 \ No newline at end of file + available_inventory: 7 + +video5: + title: "another random" + overview: "The laid-back life of a woman is going in a different direction as a childhood friend enters her life." + release_date: Date.new(Thu, 18 Jan 1979) + total_inventory: 12 + available_inventory: 4 \ No newline at end of file diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..89dd610ae 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,27 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe 'validations' do + + it 'can be instantiated when all fields are present' do + videos = Video.all + video = videos.first + + expect(video["id"]).wont_be_nil + expect(video["title"]).wont_be_nil + expect(video["overview"]).wont_be_nil + expect(video["release_date"]).wont_be_nil + expect(video["total_inventory"]).wont_be_nil + expect(video["available_inventory"]).wont_be_nil + end + + it 'testing total_inventory validations' do + videos = Video.all + video = videos.last + + puts "this is total inventory #{video.total_inventory}" + expect(video.valid?).must_equal false + + end + end end From f7620a869f19209bdffc7a0a00456a08fa88337a Mon Sep 17 00:00:00 2001 From: ChelseaC13 Date: Wed, 27 May 2020 12:49:10 -0700 Subject: [PATCH 07/16] extra uncommited items, unsure what happen --- test/controllers/videos_controller_test.rb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 78272920e..d27bc30bc 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -58,15 +58,18 @@ def check_response(expected_type:, expected_status: :success) describe "create" do let(:video_data) { { - title: "new title", - overview: "some overview", - release_date: Time.now, - total_inventory: 3, - available_inventory: 9 + video: { + title: "new title", + overview: "some overview", + release_date: Time.now, + total_inventroy: 3, + available_inventory: 9 + } } } + - it "can create a new video" do + it "can create a new pet" do expect { post videos_path, params: video_data }.must_differ "Video.count", 1 @@ -79,7 +82,7 @@ def check_response(expected_type:, expected_status: :success) # Our videosController test should just test generically # for any kind of invalid data, so we will randomly pick # the age attribute to invalidate - video_data[:available_inventory] = nil + video_data[:video][:available_inventory] = nil expect { # Act From 92ff2e5796ebf2d33432c1261761a9c76e2d5914 Mon Sep 17 00:00:00 2001 From: ChelseaC13 Date: Wed, 27 May 2020 15:52:28 -0700 Subject: [PATCH 08/16] initial test and setup for checkout done. in good spot --- app/controllers/customers_controller.rb | 6 +-- app/controllers/rentals_controller.rb | 50 +++++++++++++++++++ app/models/rental.rb | 8 +++ config/routes.rb | 4 +- .../20200527205955_add_columns_to_rental.rb | 8 +++ db/schema.rb | 10 +++- test/controllers/customers_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 39 +++++++++++++-- test/controllers/videos_controller_test.rb | 10 ++-- test/fixtures/customers.yml | 2 + test/fixtures/rentals.yml | 20 ++++++++ 11 files changed, 142 insertions(+), 17 deletions(-) create mode 100644 db/migrate/20200527205955_add_columns_to_rental.rb create mode 100644 test/fixtures/rentals.yml diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0759194eb..a6719ff78 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index - customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) # TODO Videos checked out + customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) # TODO Videos checked out render json: customers, status: :ok end @@ -27,7 +27,7 @@ def show customer = Customer.find_by(id: params[:id]) if customer - render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) return else render json: { ok: false, errors: ["Not Found"] }, status: :not_found @@ -39,7 +39,7 @@ def show private def customer_params - return params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) + return params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :videos_checked_out_count) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..cd121747d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,52 @@ class RentalsController < ApplicationController + + + def checkin + rental = Rental.find_by(rental_params) + if rental + rental.checked_in = Date.today + else + render json: { + ok:false, + errors: "rental does not exist!" + }, status: :bad_request + return + end + + if rental.save + rental.add_to_count + render json: rental.as_json(only: [:id]), status: :created + return + else + render json: { + ok:false, + errors: rental.errors.messages + }, status: :bad_request + return + end + end + + def checkout + rental = Rental.new(rental_params) + rental.checked_out = Date.today + rental.due_date = rental.checked_out + 7.days + if rental.save + rental.add_to_count + render json: rental.as_json(only: [:id]), status: :created + return + else + render json: { + ok:false, + errors: rental.errors.messages + }, status: :bad_request + return + end + end + + + + private + def rental_params + return params.permit(:video_id, :customer_id, :due_date, :checked_out, :checked_in) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 2420bf8cc..e60d1e08c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,12 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer + + def add_to_count + + self.video.available_inventory -= 1 + self.customer.videos_checked_out_count += 1 + self.save + + end end diff --git a/config/routes.rb b/config/routes.rb index c488c2fab..0b2e0f2d1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,8 +8,8 @@ resources :rentals end - resources :rentals, only: [:index, :create, :show] - + post 'rentals/checkout/', to: "rentals#checkout", as: "checkout" + post 'rentals/checkoin/', to: "rentals#checkin", as: "checkin" # get "/zomg", to: " ", as: "zomg" end diff --git a/db/migrate/20200527205955_add_columns_to_rental.rb b/db/migrate/20200527205955_add_columns_to_rental.rb new file mode 100644 index 000000000..cbcec5ce4 --- /dev/null +++ b/db/migrate/20200527205955_add_columns_to_rental.rb @@ -0,0 +1,8 @@ +class AddColumnsToRental < ActiveRecord::Migration[6.0] + def change + add_column :rentals, :checked_in, :datetime + add_column :rentals, :checked_out, :datetime + add_reference :rentals, :video, null: false, foreign_key: true + add_reference :rentals, :customer, null: false, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index bd4ca75fb..611cf7a48 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_26_185235) do +ActiveRecord::Schema.define(version: 2020_05_27_205955) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -32,6 +32,12 @@ t.string "due_date" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.datetime "checked_in" + t.datetime "checked_out" + t.bigint "video_id", null: false + t.bigint "customer_id", null: false + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" end create_table "videos", force: :cascade do |t| @@ -44,4 +50,6 @@ t.datetime "updated_at", precision: 6, null: false end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "videos" end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 0d8a84377..b9b57ce2f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -22,7 +22,7 @@ body.each do |customer| expect(customer).must_be_instance_of Hash - required_customer_attrs = ["id", "name", "registered_at", "postal_code", "phone"] + required_customer_attrs = ["id", "name", "registered_at", "postal_code", "phone","videos_checked_out_count"] expect(customer.keys.sort).must_equal required_customer_attrs.sort end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..ad7a5ad5f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,38 @@ -require "test_helper" + require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + describe "checkout" do + before do + customer = Customer.first + video = Video.first + + @rental_data = { + customer_id: customer.id, + video_id: video.id + } + end + + it "responds with JSON and success" do + post checkout_path, params: @rental_data + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :created + end + + it "responds with id" do + # Act + post checkout_path, params: @rental_data + + # Get the body of the response + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Hash + expect(body[:id]).is_a? Integer + end + + end end + + diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index d27bc30bc..fa431721b 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -57,19 +57,17 @@ def check_response(expected_type:, expected_status: :success) describe "create" do let(:video_data) { - { - video: { + { title: "new title", overview: "some overview", release_date: Time.now, - total_inventroy: 3, + total_inventory: 3, available_inventory: 9 } - } } - it "can create a new pet" do + it "can create a new video" do expect { post videos_path, params: video_data }.must_differ "Video.count", 1 @@ -82,7 +80,7 @@ def check_response(expected_type:, expected_status: :success) # Our videosController test should just test generically # for any kind of invalid data, so we will randomly pick # the age attribute to invalidate - video_data[:video][:available_inventory] = nil + video_data[:available_inventory] = nil expect { # Act diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 653e18862..473e39d04 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -6,6 +6,7 @@ customer: state: "OR" postal_code: "24309" phone: "(322) 510-8695" + videos_checked_out_count: 6 customer1: name: "Roanna Robinson" @@ -15,3 +16,4 @@ customer1: state: "PA" postal_code: "15867" phone: "(323) 336-1841" + videos_checked_out_count: 7 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..ca5e8d5b5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,20 @@ +rental: + customer_id: 1 + video_id: 1 + checked_out: 2010-09-21 + checked_in: 2010-09-26 + due_date: 2010-09-28 + +rental1: + customer_id: 2 + video_id: 2 + checked_out: 2010-07-21 + checked_in: 2010-07-26 + due_date: 2010-07-28 + +rental2: + customer_id: 3 + video_id: 3 + checked_out: 2010-09-21 + checked_in: 2010-09-26 + due_date: 2010-09-28 \ No newline at end of file From b285279a5ce503744a86f25da617d012db7f4db0 Mon Sep 17 00:00:00 2001 From: ChelseaC13 Date: Wed, 27 May 2020 16:05:35 -0700 Subject: [PATCH 09/16] wednesday evening break point currently working on no available copies --- app/models/rental.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index e60d1e08c..55e51fd42 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,10 +3,12 @@ class Rental < ApplicationRecord belongs_to :customer def add_to_count - - self.video.available_inventory -= 1 - self.customer.videos_checked_out_count += 1 - self.save + if self.video.available_inventory < 1 + return ArgumentError("No Avaialbel copies") + else + self.video_available.inventory -= 1 + self.customer.videos_checked_out_count += 1 + self.save end end From 697b04a1d6fd7e3e21019dfc9cd607567a8e24e1 Mon Sep 17 00:00:00 2001 From: Halahaddad1 Date: Wed, 27 May 2020 22:36:49 -0700 Subject: [PATCH 10/16] got some smoke tests passing --- app/controllers/customers_controller.rb | 6 +-- app/controllers/rentals_controller.rb | 49 +++++++++++++++------ app/controllers/videos_controller.rb | 15 ++++--- app/models/rental.rb | 21 +++++++-- app/models/video.rb | 1 + config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 7 +-- test/controllers/videos_controller_test.rb | 10 ++--- test/models/rental_test.rb | 10 ++++- 9 files changed, 83 insertions(+), 40 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a6719ff78..7a0ce45b0 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,8 @@ class CustomersController < ApplicationController + KEYS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] - - def index - customers = Customer.all.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) # TODO Videos checked out + def index + customers = Customer.all.as_json(only: KEYS.sort) # TODO Videos checked out render json: customers, status: :ok end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cd121747d..d725b3461 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,26 +2,39 @@ class RentalsController < ApplicationController def checkin - rental = Rental.find_by(rental_params) + rental = Rental.find_by(customer_id: rental_params[:customer_id]) + puts "rental #{rental}" + puts "customer #{rental_params[:customer_id]}" + puts "video #{rental_params[:video_id]}" + puts Customer.find_by(id: 23) + Rental.all.each{ |rental| p [rental.customer_id, rental.video_id]} + + if rental rental.checked_in = Date.today else + puts "hiiiiiiiiiiiiii" render json: { - ok:false, errors: "rental does not exist!" - }, status: :bad_request + }, status: :not_found return end + if rental.save - rental.add_to_count - render json: rental.as_json(only: [:id]), status: :created + rental.decrease_count + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: rental.customer.videos_checked_out_count, + available_inventory: rental.video.available_inventory + },status: :ok return else - render json: { - ok:false, - errors: rental.errors.messages - }, status: :bad_request + render json: { + errors: ['Not Found'] + }, status: :not_found return end end @@ -32,13 +45,21 @@ def checkout rental.due_date = rental.checked_out + 7.days if rental.save rental.add_to_count - render json: rental.as_json(only: [:id]), status: :created - return + + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: rental.customer.videos_checked_out_count, + available_inventory: rental.video.available_inventory + },status: :ok + #(only: [:customer_id, :video_id, :due_date, :rental.customers.videos_checked_out_count, :available_inventory]), + return else + render json: { - ok:false, - errors: rental.errors.messages - }, status: :bad_request + errors: ['Not Found'] + }, status: :not_found return end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 4767bdbc9..39afdd03b 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,9 @@ class VideosController < ApplicationController - +VIDEOKEYS = [:id, :title, :release_date, :available_inventory] +SHOWKEYS = [:title, :overview, :release_date, :total_inventory, :available_inventory] + def index - videos = Video.all.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]) + videos = Video.all.as_json(only: VIDEOKEYS.sort ) render json: videos, status: :ok end @@ -12,23 +14,24 @@ def create render json: video.as_json(only: [:id]), status: :created return else + puts video.errors.messages render json: { - ok: false, errors: video.errors.messages }, status: :bad_request return + puts "these are the error messages #{video.errors.messages}" end end - def show video = Video.find_by(id: params[:id]) if video - render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]) + render json: video.as_json(only: SHOWKEYS.sort) return else - render json: { ok: false, errors: ["Not Found"] }, status: :not_found + render json: { errors: ['Not Found'] }, status: :not_found + # 'errors': ['Not Found'] | AssertionError: expected [ 'ok', 'errors' ] to have the same members as [ 'errors' ] return end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 55e51fd42..d83c71e2c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,13 +2,28 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer + validates :customer_id, presence: true + validates :video_id, presence: true + validates :due_date, presence: true + # validates :customer[:videos_checked_out_count], presence: true + # validates :video[:available_inventory], presence: true + def add_to_count if self.video.available_inventory < 1 - return ArgumentError("No Avaialbel copies") + return ArgumentError("No avaialble copies") else - self.video_available.inventory -= 1 + self.video.available_inventory -= 1 self.customer.videos_checked_out_count += 1 - self.save + self.video.save + self.customer.save + end + end + + def decrease_count + self.video.available_inventory += 1 + self.customer.videos_checked_out_count -= 1 + self.video.save + self.customer.save end end diff --git a/app/models/video.rb b/app/models/video.rb index e9d8ca13f..9c600de1e 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -3,6 +3,7 @@ class Video < ApplicationRecord validates :title, presence: true validates :release_date, presence: true + validates :overview, presence: true validates :available_inventory, presence: true, numericality: { only_integer: true } validates :total_inventory, presence:true, numericality: true #TODO double check that total inventory validations are made diff --git a/config/routes.rb b/config/routes.rb index 0b2e0f2d1..cb82232fc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,8 +8,8 @@ resources :rentals end - post 'rentals/checkout/', to: "rentals#checkout", as: "checkout" - post 'rentals/checkoin/', to: "rentals#checkin", as: "checkin" + post 'rentals/check-out/', to: "rentals#checkout", as: "check-out" + post 'rentals/check-in/', to: "rentals#checkin", as: "check-in" # get "/zomg", to: " ", as: "zomg" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index ad7a5ad5f..75d4faecf 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -9,12 +9,13 @@ @rental_data = { customer_id: customer.id, - video_id: video.id + video_id: video.id, + due_date: Date.today + 7.days } end it "responds with JSON and success" do - post checkout_path, params: @rental_data + post check_out_path, params: @rental_data expect(response.header['Content-Type']).must_include 'json' must_respond_with :created @@ -22,7 +23,7 @@ it "responds with id" do # Act - post checkout_path, params: @rental_data + post check_out_path, params: @rental_data # Get the body of the response body = JSON.parse(response.body) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index fa431721b..5e784b55c 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -33,8 +33,7 @@ def check_response(expected_type:, expected_status: :success) body.each do |video| expect(video).must_be_instance_of Hash - required_video_attrs = ["id","title", "overview", "release_date", "total_inventory","available_inventory"] - + required_video_attrs = ["id","title", "release_date", "available_inventory"] expect(video.keys.sort).must_equal required_video_attrs.sort end end @@ -97,14 +96,12 @@ def check_response(expected_type:, expected_status: :success) describe "show" do it "responds with JSON and success and correct video data" do - videos = Video.all - video = videos.first + video = Video.first get video_path(video.id) body = check_response(expected_type: Hash) - expect(body.keys.sort).must_equal REQUIRED_video_FIELDS.sort - expect(body["id"]).must_equal video.id + expect(body.keys.sort).must_equal ["available_inventory", "overview", "release_date", "title", "total_inventory"].sort expect(body["title"]).must_equal video.title expect(body["release_date"]).must_equal "1979-01-18" expect(body["available_inventory"]).must_equal video.available_inventory @@ -116,7 +113,6 @@ def check_response(expected_type:, expected_status: :success) get video_path(-1) body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body["ok"]).must_equal false expect(body["errors"]).must_include "Not Found" end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..953bb8c61 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,13 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 + # describe Rental do + # describe 'relations' do + # it "has an video and customer" do + # rental = rentals(:rental) + # expect(rental.customer_id).must_equal 1 + # expect(rental.video_id).must_equal 1 + # end + # end # end end From d7e79fa915e85fdc2ad60f5e282c7f3af7383ddd Mon Sep 17 00:00:00 2001 From: Halahaddad1 Date: Wed, 27 May 2020 22:59:15 -0700 Subject: [PATCH 11/16] added log file --- test/fixtures/log.txt | 367 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 367 insertions(+) create mode 100644 test/fixtures/log.txt diff --git a/test/fixtures/log.txt b/test/fixtures/log.txt new file mode 100644 index 000000000..9a800d6b7 --- /dev/null +++ b/test/fixtures/log.txt @@ -0,0 +1,367 @@ +Started GET "/videos" for ::1 at 2020-05-27 22:42:09 -0700 +Started GET "/customers" for ::1 at 2020-05-27 22:42:09 -0700 + (28.8ms) SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC + (1.0ms) SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC +Processing by CustomersController#index as */* +Processing by VideosController#index as */* + Customer Load (53.9ms) SELECT "customers".* FROM "customers" + ↳ app/controllers/customers_controller.rb:5:in `index' + Video Load (179.4ms) SELECT "videos".* FROM "videos" + ↳ app/controllers/videos_controller.rb:6:in `index' +Completed 200 OK in 635ms (Views: 28.9ms | ActiveRecord: 341.7ms | Allocations: 40565) + + +Completed 200 OK in 1134ms (Views: 231.6ms | ActiveRecord: 246.3ms | Allocations: 63089) + + +Started POST "/rentals/check-in" for ::1 at 2020-05-27 22:42:11 -0700 +Processing by RentalsController#checkin as */* + Parameters: {"customer_id"=>"1", "video_id"=>"90"} + Rental Load (7.7ms) SELECT "rentals".* FROM "rentals" WHERE "rentals"."customer_id" = $1 LIMIT $2 [["customer_id", 1], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:5:in `checkin' +rental +customer 1 +video 90 + Customer Load (2.4ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 23], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:9:in `checkin' +# + Rental Load (0.6ms) SELECT "rentals".* FROM "rentals" + ↳ app/controllers/rentals_controller.rb:10:in `checkin' +hiiiiiiiiiiiiii +Completed 404 Not Found in 239ms (Views: 0.5ms | ActiveRecord: 215.3ms | Allocations: 4346) + + +Started GET "/customers" for ::1 at 2020-05-27 22:42:30 -0700 +Started GET "/videos" for ::1 at 2020-05-27 22:42:30 -0700 +Processing by VideosController#index as */* + Video Load (2.9ms) SELECT "videos".* FROM "videos" + ↳ app/controllers/videos_controller.rb:6:in `index' +Processing by CustomersController#index as */* +Completed 200 OK in 68ms (Views: 34.2ms | ActiveRecord: 2.9ms | Allocations: 12504) + + + Customer Load (196.6ms) SELECT "customers".* FROM "customers" + ↳ app/controllers/customers_controller.rb:5:in `index' +Completed 200 OK in 336ms (Views: 53.3ms | ActiveRecord: 196.6ms | Allocations: 34422) + + +Started POST "/rentals/check-out" for ::1 at 2020-05-27 22:42:30 -0700 +Processing by RentalsController#checkout as */* + Parameters: {"customer_id"=>"1", "video_id"=>"90"} + (4.5ms) BEGIN + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Video Load (0.3ms) SELECT "videos".* FROM "videos" WHERE "videos"."id" = $1 LIMIT $2 [["id", 90], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Customer Load (0.3ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 1], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Rental Create (63.9ms) INSERT INTO "rentals" ("due_date", "created_at", "updated_at", "checked_out", "video_id", "customer_id") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id" [["due_date", "2020-06-03 00:00:00 UTC"], ["created_at", "2020-05-28 05:42:31.158282"], ["updated_at", "2020-05-28 05:42:31.158282"], ["checked_out", "2020-05-27 00:00:00"], ["video_id", 90], ["customer_id", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + (12.2ms) COMMIT + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + (19.2ms) BEGIN + ↳ app/models/rental.rb:17:in `add_to_count' + Video Update (13.8ms) UPDATE "videos" SET "available_inventory" = $1, "updated_at" = $2 WHERE "videos"."id" = $3 [["available_inventory", 4], ["updated_at", "2020-05-28 05:42:31.239930"], ["id", 90]] + ↳ app/models/rental.rb:17:in `add_to_count' + (0.6ms) COMMIT + ↳ app/models/rental.rb:17:in `add_to_count' + (0.2ms) BEGIN + ↳ app/models/rental.rb:18:in `add_to_count' + Customer Update (1.4ms) UPDATE "customers" SET "videos_checked_out_count" = $1, "updated_at" = $2 WHERE "customers"."id" = $3 [["videos_checked_out_count", 2], ["updated_at", "2020-05-28 05:42:31.288966"], ["id", 1]] + ↳ app/models/rental.rb:18:in `add_to_count' + (1.0ms) COMMIT + ↳ app/models/rental.rb:18:in `add_to_count' +Completed 200 OK in 347ms (Views: 1.2ms | ActiveRecord: 238.5ms | Allocations: 18211) + + +Started GET "/videos" for ::1 at 2020-05-27 22:42:31 -0700 +Processing by VideosController#index as */* + Video Load (10.1ms) SELECT "videos".* FROM "videos" + ↳ app/controllers/videos_controller.rb:6:in `index' +Completed 200 OK in 28ms (Views: 5.9ms | ActiveRecord: 10.1ms | Allocations: 12037) + + +Started POST "/rentals/check-out" for ::1 at 2020-05-27 22:42:31 -0700 +Processing by RentalsController#checkout as */* + Parameters: {"customer_id"=>"-1", "video_id"=>"90"} + (0.3ms) BEGIN + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Video Load (0.4ms) SELECT "videos".* FROM "videos" WHERE "videos"."id" = $1 LIMIT $2 [["id", 90], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Customer Load (0.4ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", -1], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + (0.6ms) ROLLBACK + ↳ app/controllers/rentals_controller.rb:46:in `checkout' +Completed 404 Not Found in 30ms (Views: 0.2ms | ActiveRecord: 1.7ms | Allocations: 5502) + + +Started GET "/customers" for ::1 at 2020-05-27 22:42:31 -0700 +Processing by CustomersController#index as */* + Customer Load (22.1ms) SELECT "customers".* FROM "customers" + ↳ app/controllers/customers_controller.rb:5:in `index' +Completed 200 OK in 293ms (Views: 181.5ms | ActiveRecord: 22.1ms | Allocations: 34177) + + +Started POST "/rentals/check-out" for ::1 at 2020-05-27 22:42:31 -0700 +Processing by RentalsController#checkout as */* + Parameters: {"customer_id"=>"2", "video_id"=>"-1"} + (0.2ms) BEGIN + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Video Load (0.7ms) SELECT "videos".* FROM "videos" WHERE "videos"."id" = $1 LIMIT $2 [["id", -1], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Customer Load (11.7ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 2], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + (0.2ms) ROLLBACK + ↳ app/controllers/rentals_controller.rb:46:in `checkout' +Completed 404 Not Found in 22ms (Views: 0.2ms | ActiveRecord: 12.7ms | Allocations: 4429) + + +Started GET "/customers" for ::1 at 2020-05-27 22:42:32 -0700 +Started GET "/videos" for ::1 at 2020-05-27 22:42:32 -0700 +Processing by CustomersController#index as */* +Processing by VideosController#index as */* + Customer Load (15.3ms) SELECT "customers".* FROM "customers" + ↳ app/controllers/customers_controller.rb:5:in `index' +Completed 200 OK in 129ms (Views: 25.9ms | ActiveRecord: 15.3ms | Allocations: 34696) + + + Video Load (310.9ms) SELECT "videos".* FROM "videos" + ↳ app/controllers/videos_controller.rb:6:in `index' +Completed 200 OK in 339ms (Views: 4.0ms | ActiveRecord: 310.9ms | Allocations: 46349) + + +Started POST "/rentals/check-in" for ::1 at 2020-05-27 22:42:32 -0700 +Processing by RentalsController#checkin as */* + Parameters: {"customer_id"=>"2", "video_id"=>"90"} + Rental Load (3.9ms) SELECT "rentals".* FROM "rentals" WHERE "rentals"."customer_id" = $1 LIMIT $2 [["customer_id", 2], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:5:in `checkin' +rental +customer 2 +video 90 + Customer Load (0.5ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 23], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:9:in `checkin' +# + Rental Load (57.6ms) SELECT "rentals".* FROM "rentals" + ↳ app/controllers/rentals_controller.rb:10:in `checkin' +[1, 90] +hiiiiiiiiiiiiii +Completed 404 Not Found in 68ms (Views: 0.2ms | ActiveRecord: 62.0ms | Allocations: 2030) + + +Started GET "/videos" for ::1 at 2020-05-27 22:42:32 -0700 +Processing by VideosController#index as */* + Video Load (9.4ms) SELECT "videos".* FROM "videos" + ↳ app/controllers/videos_controller.rb:6:in `index' +Completed 200 OK in 49ms (Views: 5.3ms | ActiveRecord: 9.4ms | Allocations: 12037) + + +Started POST "/rentals/check-in" for ::1 at 2020-05-27 22:42:32 -0700 +Processing by RentalsController#checkin as */* + Parameters: {"customer_id"=>"-1", "video_id"=>"90"} + Rental Load (5.8ms) SELECT "rentals".* FROM "rentals" WHERE "rentals"."customer_id" = $1 LIMIT $2 [["customer_id", -1], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:5:in `checkin' +rental +customer -1 +video 90 + Customer Load (2.8ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 23], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:9:in `checkin' +# + Rental Load (21.0ms) SELECT "rentals".* FROM "rentals" + ↳ app/controllers/rentals_controller.rb:10:in `checkin' +[1, 90] +hiiiiiiiiiiiiii +Completed 404 Not Found in 35ms (Views: 0.3ms | ActiveRecord: 29.6ms | Allocations: 2018) + + +Started GET "/customers" for ::1 at 2020-05-27 22:42:32 -0700 +Processing by CustomersController#index as */* + Customer Load (30.5ms) SELECT "customers".* FROM "customers" + ↳ app/controllers/customers_controller.rb:5:in `index' +Completed 200 OK in 230ms (Views: 95.0ms | ActiveRecord: 30.5ms | Allocations: 34165) + + +Started POST "/rentals/check-in" for ::1 at 2020-05-27 22:42:33 -0700 +Processing by RentalsController#checkin as */* + Parameters: {"customer_id"=>"2", "video_id"=>"-1"} + Rental Load (7.6ms) SELECT "rentals".* FROM "rentals" WHERE "rentals"."customer_id" = $1 LIMIT $2 [["customer_id", 2], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:5:in `checkin' +rental +customer 2 +video -1 + Customer Load (3.9ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 23], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:9:in `checkin' +# + Rental Load (0.3ms) SELECT "rentals".* FROM "rentals" + ↳ app/controllers/rentals_controller.rb:10:in `checkin' +[1, 90] +hiiiiiiiiiiiiii +Completed 404 Not Found in 18ms (Views: 0.2ms | ActiveRecord: 11.8ms | Allocations: 2019) + + +Started GET "/videos" for ::1 at 2020-05-27 22:49:15 -0700 +Started GET "/customers" for ::1 at 2020-05-27 22:49:15 -0700 +Processing by CustomersController#index as */* +Processing by VideosController#index as */* + Customer Load (2.5ms) SELECT "customers".* FROM "customers" + ↳ app/controllers/customers_controller.rb:5:in `index' +Completed 200 OK in 183ms (Views: 83.3ms | ActiveRecord: 2.5ms | Allocations: 34908) + + + Video Load (181.2ms) SELECT "videos".* FROM "videos" + ↳ app/controllers/videos_controller.rb:6:in `index' +Completed 200 OK in 214ms (Views: 2.0ms | ActiveRecord: 181.2ms | Allocations: 46465) + + +Started POST "/rentals/check-out" for ::1 at 2020-05-27 22:49:16 -0700 +Processing by RentalsController#checkout as */* + Parameters: {"customer_id"=>"2", "video_id"=>"90"} + (28.4ms) BEGIN + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Video Load (0.5ms) SELECT "videos".* FROM "videos" WHERE "videos"."id" = $1 LIMIT $2 [["id", 90], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Customer Load (15.1ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 2], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Rental Create (1.1ms) INSERT INTO "rentals" ("due_date", "created_at", "updated_at", "checked_out", "video_id", "customer_id") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id" [["due_date", "2020-06-03 00:00:00 UTC"], ["created_at", "2020-05-28 05:49:16.305210"], ["updated_at", "2020-05-28 05:49:16.305210"], ["checked_out", "2020-05-27 00:00:00"], ["video_id", 90], ["customer_id", 2]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + (10.4ms) COMMIT + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + (0.1ms) BEGIN + ↳ app/models/rental.rb:17:in `add_to_count' + Video Update (0.4ms) UPDATE "videos" SET "available_inventory" = $1, "updated_at" = $2 WHERE "videos"."id" = $3 [["available_inventory", 3], ["updated_at", "2020-05-28 05:49:16.319796"], ["id", 90]] + ↳ app/models/rental.rb:17:in `add_to_count' + (0.5ms) COMMIT + ↳ app/models/rental.rb:17:in `add_to_count' + (0.4ms) BEGIN + ↳ app/models/rental.rb:18:in `add_to_count' + Customer Update (0.3ms) UPDATE "customers" SET "videos_checked_out_count" = $1, "updated_at" = $2 WHERE "customers"."id" = $3 [["videos_checked_out_count", 2], ["updated_at", "2020-05-28 05:49:16.324513"], ["id", 2]] + ↳ app/models/rental.rb:18:in `add_to_count' + (0.4ms) COMMIT + ↳ app/models/rental.rb:18:in `add_to_count' +Completed 200 OK in 90ms (Views: 0.6ms | ActiveRecord: 61.8ms | Allocations: 9584) + + +Started GET "/videos" for ::1 at 2020-05-27 22:49:16 -0700 +Processing by VideosController#index as */* + Video Load (3.2ms) SELECT "videos".* FROM "videos" + ↳ app/controllers/videos_controller.rb:6:in `index' +Completed 200 OK in 36ms (Views: 21.1ms | ActiveRecord: 3.2ms | Allocations: 12037) + + +Started POST "/rentals/check-out" for ::1 at 2020-05-27 22:49:16 -0700 +Processing by RentalsController#checkout as */* + Parameters: {"customer_id"=>"-1", "video_id"=>"90"} + (40.1ms) BEGIN + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Video Load (3.9ms) SELECT "videos".* FROM "videos" WHERE "videos"."id" = $1 LIMIT $2 [["id", 90], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Customer Load (4.4ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", -1], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + (2.1ms) ROLLBACK + ↳ app/controllers/rentals_controller.rb:46:in `checkout' +Completed 404 Not Found in 62ms (Views: 0.3ms | ActiveRecord: 50.5ms | Allocations: 4381) + + +Started GET "/customers" for ::1 at 2020-05-27 22:49:16 -0700 +Processing by CustomersController#index as */* + Customer Load (2.2ms) SELECT "customers".* FROM "customers" + ↳ app/controllers/customers_controller.rb:5:in `index' +Completed 200 OK in 131ms (Views: 53.4ms | ActiveRecord: 2.2ms | Allocations: 34165) + + +Started POST "/rentals/check-out" for ::1 at 2020-05-27 22:49:16 -0700 +Processing by RentalsController#checkout as */* + Parameters: {"customer_id"=>"3", "video_id"=>"-1"} + (0.7ms) BEGIN + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Video Load (22.9ms) SELECT "videos".* FROM "videos" WHERE "videos"."id" = $1 LIMIT $2 [["id", -1], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + Customer Load (17.0ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 3], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:46:in `checkout' + (16.8ms) ROLLBACK + ↳ app/controllers/rentals_controller.rb:46:in `checkout' +Completed 404 Not Found in 67ms (Views: 0.2ms | ActiveRecord: 57.4ms | Allocations: 4383) + + +Started GET "/videos" for ::1 at 2020-05-27 22:49:16 -0700 +Started GET "/customers" for ::1 at 2020-05-27 22:49:16 -0700 +Processing by VideosController#index as */* +Processing by CustomersController#index as */* + Video Load (233.6ms) SELECT "videos".* FROM "videos" + ↳ app/controllers/videos_controller.rb:6:in `index' +Completed 200 OK in 253ms (Views: 3.9ms | ActiveRecord: 233.6ms | Allocations: 12568) + + + Customer Load (240.0ms) SELECT "customers".* FROM "customers" + ↳ app/controllers/customers_controller.rb:5:in `index' +Completed 200 OK in 399ms (Views: 52.9ms | ActiveRecord: 240.0ms | Allocations: 46293) + + +Started POST "/rentals/check-in" for ::1 at 2020-05-27 22:49:17 -0700 +Processing by RentalsController#checkin as */* + Parameters: {"customer_id"=>"3", "video_id"=>"90"} + Rental Load (2.2ms) SELECT "rentals".* FROM "rentals" WHERE "rentals"."customer_id" = $1 LIMIT $2 [["customer_id", 3], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:5:in `checkin' +rental +customer 3 +video 90 + Customer Load (3.7ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 23], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:9:in `checkin' +# + Rental Load (0.3ms) SELECT "rentals".* FROM "rentals" + ↳ app/controllers/rentals_controller.rb:10:in `checkin' +[1, 90] +[2, 90] +hiiiiiiiiiiiiii +Completed 404 Not Found in 13ms (Views: 0.2ms | ActiveRecord: 6.9ms | Allocations: 2072) + + +Started GET "/videos" for ::1 at 2020-05-27 22:49:17 -0700 +Processing by VideosController#index as */* + Video Load (94.5ms) SELECT "videos".* FROM "videos" + ↳ app/controllers/videos_controller.rb:6:in `index' +Completed 200 OK in 115ms (Views: 4.8ms | ActiveRecord: 94.5ms | Allocations: 12061) + + +Started POST "/rentals/check-in" for ::1 at 2020-05-27 22:49:17 -0700 +Processing by RentalsController#checkin as */* + Parameters: {"customer_id"=>"-1", "video_id"=>"90"} + Rental Load (0.4ms) SELECT "rentals".* FROM "rentals" WHERE "rentals"."customer_id" = $1 LIMIT $2 [["customer_id", -1], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:5:in `checkin' +rental +customer -1 +video 90 + Customer Load (1.0ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 23], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:9:in `checkin' +# + Rental Load (0.3ms) SELECT "rentals".* FROM "rentals" + ↳ app/controllers/rentals_controller.rb:10:in `checkin' +[1, 90] +[2, 90] +hiiiiiiiiiiiiii +Completed 404 Not Found in 6ms (Views: 0.2ms | ActiveRecord: 1.7ms | Allocations: 2037) + + +Started GET "/customers" for ::1 at 2020-05-27 22:49:17 -0700 +Processing by CustomersController#index as */* + Customer Load (1.7ms) SELECT "customers".* FROM "customers" + ↳ app/controllers/customers_controller.rb:5:in `index' +Completed 200 OK in 121ms (Views: 50.2ms | ActiveRecord: 1.7ms | Allocations: 34165) + + +Started POST "/rentals/check-in" for ::1 at 2020-05-27 22:49:18 -0700 +Processing by RentalsController#checkin as */* + Parameters: {"customer_id"=>"3", "video_id"=>"-1"} + Rental Load (25.4ms) SELECT "rentals".* FROM "rentals" WHERE "rentals"."customer_id" = $1 LIMIT $2 [["customer_id", 3], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:5:in `checkin' +rental +customer 3 +video -1 + Customer Load (0.3ms) SELECT "customers".* FROM "customers" WHERE "customers"."id" = $1 LIMIT $2 [["id", 23], ["LIMIT", 1]] + ↳ app/controllers/rentals_controller.rb:9:in `checkin' +# + Rental Load (0.3ms) SELECT "rentals".* FROM "rentals" + ↳ app/controllers/rentals_controller.rb:10:in `checkin' +[1, 90] +[2, 90] +hiiiiiiiiiiiiii +Completed 404 Not Found in 31ms (Views: 0.2ms | ActiveRecord: 26.1ms | Allocations: 2037) + From 10bc56938239d0873a5df2d313651ee233f6831d Mon Sep 17 00:00:00 2001 From: Halahaddad1 Date: Thu, 28 May 2020 07:11:21 -0700 Subject: [PATCH 12/16] added tests for check in and check out --- Gemfile.lock | 33 +++++++++ app/controllers/customers_controller.rb | 2 +- app/controllers/rentals_controller.rb | 68 +++++++++---------- app/controllers/videos_controller.rb | 2 +- app/models/rental.rb | 27 ++++++-- test/controllers/customers_controller_test.rb | 22 +++--- test/controllers/rentals_controller_test.rb | 46 ++++++++++++- test/controllers/videos_controller_test.rb | 24 +++---- test/fixtures/rentals.yml | 4 +- test/models/rental_test.rb | 58 +++++++++++++--- 10 files changed, 206 insertions(+), 80 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 41b7d4311..12575c3a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,6 +59,8 @@ GEM ansi (1.5.0) bootsnap (1.4.6) msgpack (~> 1.0) + bootsnap (1.4.6-java) + msgpack (~> 1.0) builder (3.2.4) byebug (11.1.3) coderay (1.1.2) @@ -69,6 +71,9 @@ GEM debase-ruby_core_source (0.10.9) erubi (1.9.0) ffi (1.12.2) + ffi (1.12.2-java) + ffi (1.12.2-x64-mingw32) + ffi (1.12.2-x86-mingw32) formatador (0.2.5) globalid (0.4.2) activesupport (>= 4.2.0) @@ -112,21 +117,38 @@ GEM minitest (>= 5.0) ruby-progressbar msgpack (1.3.3) + msgpack (1.3.3-java) + msgpack (1.3.3-x64-mingw32) + msgpack (1.3.3-x86-mingw32) nenv (0.3.0) nio4r (2.5.2) + nio4r (2.5.2-java) nokogiri (1.10.9) mini_portile2 (~> 2.4.0) + nokogiri (1.10.9-java) + nokogiri (1.10.9-x64-mingw32) + mini_portile2 (~> 2.4.0) + nokogiri (1.10.9-x86-mingw32) + mini_portile2 (~> 2.4.0) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) pg (1.2.3) + pg (1.2.3-x64-mingw32) + pg (1.2.3-x86-mingw32) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) + pry (0.13.1-java) + coderay (~> 1.1) + method_source (~> 1.0) + spoon (~> 0.0) pry-rails (0.3.9) pry (>= 0.10.4) puma (4.3.5) nio4r (~> 2.0) + puma (4.3.5-java) + nio4r (~> 2.0) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -164,6 +186,8 @@ GEM rake (>= 0.8.1) ruby-progressbar (1.10.1) shellany (0.0.1) + spoon (0.0.6) + ffi spring (2.1.0) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) @@ -177,15 +201,24 @@ GEM sprockets (>= 3.0.0) thor (1.0.1) thread_safe (0.3.6) + thread_safe (0.3.6-java) tzinfo (1.2.7) thread_safe (~> 0.1) + tzinfo-data (1.2020.1) + tzinfo (>= 1.0.0) websocket-driver (0.7.2) websocket-extensions (>= 0.1.0) + websocket-driver (0.7.2-java) + websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) zeitwerk (2.3.0) PLATFORMS + java ruby + x64-mingw32 + x86-mingw32 + x86-mswin32 DEPENDENCIES bootsnap (>= 1.4.2) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 7a0ce45b0..5d55694c3 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController KEYS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] def index - customers = Customer.all.as_json(only: KEYS.sort) # TODO Videos checked out + customers = Customer.order(:name).all.as_json(only: KEYS.sort) # TODO Videos checked out render json: customers, status: :ok end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d725b3461..638463a0f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,13 +1,39 @@ class RentalsController < ApplicationController + + + def checkout + rental = Rental.new(rental_params) + rental.checked_out = Date.today + rental.due_date = rental.checked_out + 7.days + if rental.save + rental.add_to_count + + render json: { + customer_id: rental.customer_id, + video_id: rental.video_id, + due_date: rental.due_date, + videos_checked_out_count: rental.customer.videos_checked_out_count, + available_inventory: rental.video.available_inventory + },status: :ok + #(only: [:customer_id, :video_id, :due_date, :rental.customers.videos_checked_out_count, :available_inventory]), + return + else + + render json: { + errors: ['Not Found'] + }, status: :not_found + return + end + end def checkin - rental = Rental.find_by(customer_id: rental_params[:customer_id]) - puts "rental #{rental}" - puts "customer #{rental_params[:customer_id]}" - puts "video #{rental_params[:video_id]}" - puts Customer.find_by(id: 23) - Rental.all.each{ |rental| p [rental.customer_id, rental.video_id]} + rental = Rental.find_by_customer_id_and_video_id(rental_params[:customer_id],rental_params[:video_id]) + + # puts "rental #{rental.customer_id}" + # puts "customer #{rental_params[:customer_id]}" + # puts "video #{rental_params[:video_id]}" + # Rental.all.each{ |rental| p [rental.customer_id, rental.video_id]} if rental @@ -15,7 +41,7 @@ def checkin else puts "hiiiiiiiiiiiiii" render json: { - errors: "rental does not exist!" + errors: ["Not Found"] }, status: :not_found return end @@ -26,7 +52,6 @@ def checkin render json: { customer_id: rental.customer_id, video_id: rental.video_id, - due_date: rental.due_date, videos_checked_out_count: rental.customer.videos_checked_out_count, available_inventory: rental.video.available_inventory },status: :ok @@ -39,33 +64,6 @@ def checkin end end - def checkout - rental = Rental.new(rental_params) - rental.checked_out = Date.today - rental.due_date = rental.checked_out + 7.days - if rental.save - rental.add_to_count - - render json: { - customer_id: rental.customer_id, - video_id: rental.video_id, - due_date: rental.due_date, - videos_checked_out_count: rental.customer.videos_checked_out_count, - available_inventory: rental.video.available_inventory - },status: :ok - #(only: [:customer_id, :video_id, :due_date, :rental.customers.videos_checked_out_count, :available_inventory]), - return - else - - render json: { - errors: ['Not Found'] - }, status: :not_found - return - end - end - - - private def rental_params return params.permit(:video_id, :customer_id, :due_date, :checked_out, :checked_in) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 39afdd03b..a300e6c08 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -3,7 +3,7 @@ class VideosController < ApplicationController SHOWKEYS = [:title, :overview, :release_date, :total_inventory, :available_inventory] def index - videos = Video.all.as_json(only: VIDEOKEYS.sort ) + videos = Video.order(:title).all.as_json(only: VIDEOKEYS.sort ) render json: videos, status: :ok end diff --git a/app/models/rental.rb b/app/models/rental.rb index d83c71e2c..b2b45dc6a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -9,21 +9,34 @@ class Rental < ApplicationRecord # validates :video[:available_inventory], presence: true def add_to_count - if self.video.available_inventory < 1 - return ArgumentError("No avaialble copies") + if self.video.available_inventory.nil? + self.video.available_inventory = self.video.total_inventory - 1 + self.video.save + + self.customer.videos_checked_out_count += 1 + self.customer.save else self.video.available_inventory -= 1 - self.customer.videos_checked_out_count += 1 self.video.save + + self.customer.videos_checked_out_count += 1 self.customer.save end end def decrease_count - self.video.available_inventory += 1 - self.customer.videos_checked_out_count -= 1 - self.video.save - self.customer.save + if self.checked_out != nil + if self.video.available_inventory == nil + return "This video has not been returned yet" + else + self.video.available_inventory += 1 + self.video.save + + self.customer.videos_checked_out_count -= 1 + self.customer.save + self.save + end + end end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b9b57ce2f..4f3306fc5 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -28,18 +28,18 @@ end end - it "will respond with an empty array when there are no customers" do - # Arrange - Customer.destroy_all + # 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) + # # Act + # get customers_path + # body = JSON.parse(response.body) - # Assert - expect(body).must_be_instance_of Array - expect(body).must_equal [] - expect(status).must_equal 200 #added this - end + # # Assert + # expect(body).must_be_instance_of Array + # expect(body).must_equal [] + # expect(status).must_equal 200 #added this + # end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 75d4faecf..001c4407a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -18,7 +18,7 @@ post check_out_path, params: @rental_data expect(response.header['Content-Type']).must_include 'json' - must_respond_with :created + must_respond_with :ok end it "responds with id" do @@ -34,6 +34,50 @@ end end + + describe "checkin" do + before do + @video = videos(:video2) + @customer = Customer.first + @rental_data = { + video_id: @video.id, + customer_id: @customer.id + } + end + + it "can assign a checkin_date and change available_inventory and videos_checked_out_count" do + post check_out_path, params: @rental_data + + inventory = Rental.last.video.available_inventory + checked_out_count = Rental.last.customer.videos_checked_out_count + + expect { + post check_in_path, params: @rental_data + }.wont_change 'Rental.count' + + body = JSON.parse(response.body) + must_respond_with :ok + rental = Rental.find_by(customer_id: body["customer_id"]) + expect(rental.video.available_inventory).must_equal (inventory + 1) + expect(rental.checked_in).must_equal Date.today + + expect(rental.customer.videos_checked_out_count).must_equal (checked_out_count - 1) + end + + it "will respond with bad_request for invalid data" do + # Arrange - using let from above + @rental_data[:video_id] = nil + expect { + # Act + post check_in_path, params: @rental_data + # Assert + }.wont_change "Rental.count" + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"]).must_equal ["Not Found"] + end + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 5e784b55c..94fcf51d8 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -38,19 +38,19 @@ def check_response(expected_type:, expected_status: :success) end end - it "will respond with an empty array when there are no videos" do - # Arrange - Video.destroy_all + # it "will respond with an empty array when there are no videos" do + # # Arrange + # Video.destroy_all - # Act - get videos_path - body = JSON.parse(response.body) - - # Assert - expect(body).must_be_instance_of Array - expect(body).must_equal [] - expect(status).must_equal 200 - end + # # Act + # get videos_path + # body = JSON.parse(response.body) + + # # Assert + # expect(body).must_be_instance_of Array + # expect(body).must_equal [] + # expect(status).must_equal 200 + # end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index ca5e8d5b5..766dbb2a6 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,6 +1,6 @@ rental: - customer_id: 1 - video_id: 1 + customer_id: 981560992 #customers(:customer).id + video_id: 678499636 # videos(:video2).id checked_out: 2010-09-21 checked_in: 2010-09-26 due_date: 2010-09-28 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 953bb8c61..c57a039d9 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,13 +1,51 @@ require "test_helper" describe Rental do - # describe Rental do - # describe 'relations' do - # it "has an video and customer" do - # rental = rentals(:rental) - # expect(rental.customer_id).must_equal 1 - # expect(rental.video_id).must_equal 1 - # end - # end - # end -end + describe "relations" do + before do + @rental = rentals(:rental) + @c = customers(:customer1) + @v = videos(:video2) + + puts @c.id + puts @v.id + end + + + + it "belongs to a video" do + expect(@rental.video).must_be_instance_of Video + end + + it "belongs to a customer" do + expect(@rental.customer).must_be_instance_of Customer + end + end + + describe "validations" do + before do + video = videos(:video2) + customer = customers(:customer1) + puts "this is #{video.id}" + puts customer.id + @rental = Rental.create(video_id: video.id, customer_id: customer.id, due_date: Date.today) + + end + + it "is valid when all fields are present" do + expect(@rental.valid?).must_equal true + end + + it "is not valid when video is missing" do + @rental.video_id = nil + + expect(@rental.valid?).must_equal false + end + + it "is not valid when customer is missing" do + @rental.customer_id = nil + + expect(@rental.valid?).must_equal false + end + end +end \ No newline at end of file From 3aadae311ed2af122fec0f3c5821e5cf97d6737f Mon Sep 17 00:00:00 2001 From: Halahaddad1 Date: Thu, 28 May 2020 07:38:15 -0700 Subject: [PATCH 13/16] more tests added --- test/fixtures/customers.yml | 12 ++++++- test/models/customer_test.rb | 52 +++++++++++++++++++++++++++--- test/models/video_test.rb | 61 +++++++++++++++++++++++++++++++++--- 3 files changed, 115 insertions(+), 10 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 473e39d04..9634016aa 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -6,7 +6,7 @@ customer: state: "OR" postal_code: "24309" phone: "(322) 510-8695" - videos_checked_out_count: 6 + videos_checked_out_count: 0 customer1: name: "Roanna Robinson" @@ -17,3 +17,13 @@ customer1: postal_code: "15867" phone: "(323) 336-1841" videos_checked_out_count: 7 + +customer2: + name: "Roanna Robinson" + registered_at: "Fri, 28 Nov 2014 13:14:08 -0800" + address: "Ap #561-4214 Eget St." + city: "Harrisburg" + state: "PA" + postal_code: "15867" + phone: "(323) 336-1841" + videos_checked_out_count: 6 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..2bdc55084 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,51 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end -end + describe "relations" do + let(:customer) { customers(:customer) } + let(:video) {videos(:video2)} + let(:video2) {videos(:video3)} + + it "can have many rentals" do + Rental.create(video_id: video.id, customer_id: customer.id, due_date: Date.yesterday) + Rental.create(video_id: video2.id, customer_id: customer.id, due_date: Date.today) + + expect(customer.rentals.length).must_equal 2 + end + + it "can have zero rentals" do + customer_two = customers(:customer) + + expect(customer_two.rentals.length).must_equal 0 + end + end + + describe "validations" do + before do + @customer = Customer.create(name: "Some Name", registered_at: "Mon, 14 Jun 2019 18:09:04 -0700", address: "Some house North Avenue", city: "Kirkland", state: "Wa", postal_code: "98034", phone: "(521) 124-5753") + end + + it "is valid when all fields are present" do + + expect(@customer.valid?).must_equal true + end + + it "is not valid if name is not present" do + @customer.name = nil + + expect(@customer.valid?).must_equal false + end + + it "is not valid if postal code is not present" do + @customer.postal_code = nil + + expect(@customer.valid?).must_equal false + end + + it "is not valid if phone is not present" do + @customer.phone = nil + + expect(@customer.valid?).must_equal false + end + end +end \ No newline at end of file diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 89dd610ae..cee2f81b0 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,11 +1,26 @@ require "test_helper" describe Video do + let(:video) {videos(:video2)} + let(:customer) { customers(:customer) } + let(:customer2) { customers(:customer1) } + + describe "relations" do + it "can have many rentals" do + Rental.create(video_id: video.id, customer_id: customer.id, due_date: Date.today) + Rental.create(video_id: video.id, customer_id: customer2.id, due_date: Date.today) + + expect(video.rentals.length).must_equal 3 + end + end + describe 'validations' do it 'can be instantiated when all fields are present' do videos = Video.all video = videos.first + + expect(video["id"]).wont_be_nil expect(video["title"]).wont_be_nil @@ -15,13 +30,49 @@ expect(video["available_inventory"]).wont_be_nil end - it 'testing total_inventory validations' do - videos = Video.all - video = videos.last + # it 'testing total_inventory validations' do - puts "this is total inventory #{video.total_inventory}" - expect(video.valid?).must_equal false + # puts "this is total inventory #{video.total_inventory}" + # expect(video.valid?).must_equal false + + # end + + it "is not valid when title is missing" do + video.title = nil + + expect(video.valid?).must_equal false + end + + it "is not valid when overview is missing" do + video.overview = nil + + expect(video.valid?).must_equal false + end + + it "is not valid when release_date is missing" do + video.release_date = nil + + expect(video.valid?).must_equal false + end + + it "is not valid when inventory is missing" do + video.total_inventory = nil + + expect(video.valid?).must_equal false + end + + it "is not valid when inventory is not an integer" do + video.total_inventory = "five" + + expect(video.valid?).must_equal false end end end + + + + + + + \ No newline at end of file From debd9f5e229ac64941a40858c97f6f9520325f1f Mon Sep 17 00:00:00 2001 From: Halahaddad1 Date: Thu, 28 May 2020 09:19:44 -0700 Subject: [PATCH 14/16] minor edit --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 638463a0f..00f36ce6c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -39,7 +39,7 @@ def checkin if rental rental.checked_in = Date.today else - puts "hiiiiiiiiiiiiii" + puts "hi Chelsea :) :) :)" render json: { errors: ["Not Found"] }, status: :not_found From 3aa97ed3cb90fa21482e3f77959b6521c37bf2ea Mon Sep 17 00:00:00 2001 From: ChelseaC13 Date: Thu, 28 May 2020 14:27:55 -0700 Subject: [PATCH 15/16] chelsea additions --- app/controllers/customers_controller.rb | 56 ++++++------ app/controllers/rentals_controller.rb | 21 +++-- app/models/customer.rb | 2 +- app/models/rental.rb | 3 +- app/models/video.rb | 2 +- test/controllers/customers_controller_test.rb | 30 +++---- test/controllers/rentals_controller_test.rb | 86 ++++++++++++++++--- test/controllers/videos_controller_test.rb | 82 +++++++++++++----- test/models/customer_test.rb | 7 ++ test/models/rental_test.rb | 18 ++-- test/models/video_test.rb | 24 ++++-- 11 files changed, 231 insertions(+), 100 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5d55694c3..a904cc43f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,38 +2,38 @@ class CustomersController < ApplicationController KEYS = [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count] def index - customers = Customer.order(:name).all.as_json(only: KEYS.sort) # TODO Videos checked out + customers = Customer.order(:name).all.as_json(only: KEYS.sort) render json: customers, status: :ok end - def create - customer = Customer.new(customer_params) - - if customer.save - render json: customer.as_json(only: [:id]), status: :created - return - else - render json: { - ok: false, - errors: customer.errors.messages - }, status: :bad_request - return - end - end - - - def show - customer = Customer.find_by(id: params[:id]) - - if customer - render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) - return - else - render json: { ok: false, errors: ["Not Found"] }, status: :not_found - return - end - end + # def create + # customer = Customer.new(customer_params) + + # if customer.save + # render json: customer.as_json(only: [:id]), status: :created + # return + # else + # render json: { + # ok: false, + # errors: customer.errors.messages + # }, status: :bad_request + # return + # end + # end + + + # def show + # customer = Customer.find_by(id: params[:id]) + + # if customer + # render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) + # return + # else + # render json: { ok: false, errors: ["Not Found"] }, status: :not_found + # return + # end + # end private diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 00f36ce6c..9fc31c015 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,6 +4,16 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(rental_params) + + # video = Video.find_by(id: rental.video_id) + # p "1111111111#{video.available_inventory}" + # if video.available_inventory.nil? + # render json: { + # errors: ['No inventory available'] + # }, status: :not_found + # return + # end + rental.checked_out = Date.today rental.due_date = rental.checked_out + 7.days if rental.save @@ -39,11 +49,10 @@ def checkin if rental rental.checked_in = Date.today else - puts "hi Chelsea :) :) :)" - render json: { - errors: ["Not Found"] - }, status: :not_found - return + render json: { + errors: ["Not Found"] + }, status: :not_found + return end @@ -56,7 +65,7 @@ def checkin available_inventory: rental.video.available_inventory },status: :ok return - else + else render json: { errors: ['Not Found'] }, status: :not_found diff --git a/app/models/customer.rb b/app/models/customer.rb index 9a0c03046..104adfdf7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord - has_many :rentals + has_many :rentals, dependent: :destroy validates :name, presence: true validates :registered_at, presence: true diff --git a/app/models/rental.rb b/app/models/rental.rb index b2b45dc6a..3e19de664 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -10,6 +10,7 @@ class Rental < ApplicationRecord def add_to_count if self.video.available_inventory.nil? + # chelsea confused here self.video.available_inventory = self.video.total_inventory - 1 self.video.save @@ -27,7 +28,7 @@ def add_to_count def decrease_count if self.checked_out != nil - if self.video.available_inventory == nil + if self.video.available_inventory == nil # when would this happen? return "This video has not been returned yet" else self.video.available_inventory += 1 diff --git a/app/models/video.rb b/app/models/video.rb index 9c600de1e..d45d6b620 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,5 +1,5 @@ class Video < ApplicationRecord - has_many :rentals + has_many :rentals, dependent: :destroy validates :title, presence: true validates :release_date, presence: true diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 4f3306fc5..47cae8d1c 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -10,14 +10,12 @@ must_respond_with :ok end + it "responds with an array of customer hashes" do - # Act + get customers_path - - # Get the body of the response body = JSON.parse(response.body) - # Assert expect(body).must_be_instance_of Array body.each do |customer| expect(customer).must_be_instance_of Hash @@ -28,18 +26,16 @@ 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 [] - # expect(status).must_equal 200 #added this - # end + #got working - chelsea to tell hala how + it "will respond with an empty array when there are no customers" do + Customer.destroy_all + + get customers_path + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body).must_equal [] + expect(status).must_equal 200 #added this + end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 001c4407a..2e8b75c75 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -22,16 +22,70 @@ end it "responds with id" do - # Act post check_out_path, params: @rental_data - - # Get the body of the response body = JSON.parse(response.body) - # Assert expect(body).must_be_instance_of Hash expect(body[:id]).is_a? Integer - end + end + + + + # it "return detailed errors and 400: Bad Request if no available inventory before check out" do + # @rental_data.video.available_inventory = nil + + # post check_out_path, params: @rental_data + + # expect(response.header['Content-Type']).must_include 'json' + # must_respond_with :not_found + # end + + + + + + # it "can assign a checkout_date and change available_inventory and videos_checked_out_count" do + # video_rental = Rental.find_by(video_id: video.id) + # inventory = video_rental.available_inventory + # # checked_out_count = Rental.last.customer.videos_checked_out_count + + # post check_out_path, params: @rental_data + + # body = JSON.parse(response.body) + # must_respond_with :ok + # rental = Rental.find_by(customer_id: body["customer_id"]) + # p "111111111111111111 #{body}" + # expect(rental.video.available_inventory).must_equal (inventory - 1) + # # expect(body["due_date"]).must_equal Date.today + 7.days + + # # expect(rbody["videos_checked_out_count"]).must_equal (checked_out_count - 1) + # end + + it "will respond with bad_request for invalid video" do + + @rental_data[:video_id] = nil + expect { + post check_out_path, params: @rental_data + }.wont_change "Rental.count" + + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"]).must_equal ["Not Found"] + end + + it "will respond with bad_request for invalid customer" do + + @rental_data[:customer_id] = nil + expect { + post check_out_path, params: @rental_data + }.wont_change "Rental.count" + + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"]).must_equal ["Not Found"] + end end @@ -44,7 +98,7 @@ customer_id: @customer.id } end - + it "can assign a checkin_date and change available_inventory and videos_checked_out_count" do post check_out_path, params: @rental_data @@ -64,14 +118,26 @@ expect(rental.customer.videos_checked_out_count).must_equal (checked_out_count - 1) end - it "will respond with bad_request for invalid data" do - # Arrange - using let from above + it "will respond with bad_request for invalid video" do + @rental_data[:video_id] = nil expect { - # Act post check_in_path, params: @rental_data - # Assert }.wont_change "Rental.count" + + must_respond_with :not_found + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"]).must_equal ["Not Found"] + end + + it "will respond with bad_request for invalid customer" do + + @rental_data[:customer_id] = nil + expect { + post check_in_path, params: @rental_data + }.wont_change "Rental.count" + must_respond_with :not_found expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 94fcf51d8..3d8d89a44 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -12,7 +12,6 @@ def check_response(expected_type:, expected_status: :success) describe VideosController do REQUIRED_video_FIELDS = ["id", "title", "overview","release_date", "total_inventory","available_inventory"].sort - describe "index" do it "responds with JSON and success" do get videos_path @@ -38,21 +37,21 @@ def check_response(expected_type:, expected_status: :success) end end - # it "will respond with an empty array when there are no videos" do - # # Arrange - # Video.destroy_all + # added and dependent destroy + it "will respond with an empty array when there are no videos" do + # Arrange + Video.destroy_all - # # Act - # get videos_path - # body = JSON.parse(response.body) - - # # Assert - # expect(body).must_be_instance_of Array - # expect(body).must_equal [] - # expect(status).must_equal 200 - # end - end + # Act + get videos_path + body = JSON.parse(response.body) + # Assert + expect(body).must_be_instance_of Array + expect(body).must_equal [] + expect(status).must_equal 200 + end + end describe "create" do let(:video_data) { @@ -65,7 +64,6 @@ def check_response(expected_type:, expected_status: :success) } } - it "can create a new video" do expect { post videos_path, params: video_data @@ -74,24 +72,62 @@ def check_response(expected_type:, expected_status: :success) check_response(expected_type: Hash, expected_status: :created) end - it "will respond with bad_request for invalid data" do - # Arrange - using let from above - # Our videosController test should just test generically - # for any kind of invalid data, so we will randomly pick - # the age attribute to invalidate + it "will respond with bad_request for invalid available_inventory" do video_data[:available_inventory] = nil expect { - # Act post videos_path, params: video_data - - # Assert }.wont_change "Video.count" body = check_response(expected_type: Hash, expected_status: :bad_request) expect(body["errors"].keys).must_include "available_inventory" end + + it "will respond with bad_request for invalid title" do + video_data[:title] = nil + + expect { + post videos_path, params: video_data + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "title" + end + + it "will respond with bad_request for invalid release_date" do + video_data[:release_date] = nil + + expect { + post videos_path, params: video_data + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "release_date" + end + + it "will respond with bad_request for invalid overview" do + video_data[:overview] = nil + + expect { + post videos_path, params: video_data + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "overview" + end + + it "will respond with bad_request for invalid total_inventory" do + video_data[:total_inventory] = nil + + expect { + post videos_path, params: video_data + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "total_inventory" + end + end describe "show" do diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 2bdc55084..b378ce090 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -47,5 +47,12 @@ expect(@customer.valid?).must_equal false end + + #registered_at + it "is not valid if registered_at is not present" do + @customer.registered_at = nil + + expect(@customer.valid?).must_equal false + end end end \ No newline at end of file diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index c57a039d9..4e14ba2c8 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -7,11 +7,9 @@ @c = customers(:customer1) @v = videos(:video2) - puts @c.id - puts @v.id + #puts @c.id + #puts @v.id end - - it "belongs to a video" do expect(@rental.video).must_be_instance_of Video @@ -26,8 +24,8 @@ before do video = videos(:video2) customer = customers(:customer1) - puts "this is #{video.id}" - puts customer.id + #puts "this is #{video.id}" + #puts customer.id @rental = Rental.create(video_id: video.id, customer_id: customer.id, due_date: Date.today) end @@ -47,5 +45,13 @@ expect(@rental.valid?).must_equal false end + + + #chelsea added + it "is not valid when the due_date is missing" do + @rental.due_date = nil + + expect(@rental.valid?).must_equal false + end end end \ No newline at end of file diff --git a/test/models/video_test.rb b/test/models/video_test.rb index cee2f81b0..e014b0cb4 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Video do - let(:video) {videos(:video2)} + let(:video) {videos(:video3)} let(:customer) { customers(:customer) } let(:customer2) { customers(:customer1) } @@ -9,8 +9,7 @@ it "can have many rentals" do Rental.create(video_id: video.id, customer_id: customer.id, due_date: Date.today) Rental.create(video_id: video.id, customer_id: customer2.id, due_date: Date.today) - - expect(video.rentals.length).must_equal 3 + expect(video.rentals.length).must_equal 2 end end @@ -19,8 +18,6 @@ it 'can be instantiated when all fields are present' do videos = Video.all video = videos.first - - expect(video["id"]).wont_be_nil expect(video["title"]).wont_be_nil @@ -56,17 +53,30 @@ expect(video.valid?).must_equal false end - it "is not valid when inventory is missing" do + it "is not valid when total_inventory is missing" do video.total_inventory = nil expect(video.valid?).must_equal false end - it "is not valid when inventory is not an integer" do + it "is not valid when total_inventory is not an integer" do video.total_inventory = "five" expect(video.valid?).must_equal false end + + #chelsea added + it "is not valid when available_inventory is not an integer" do + video.available_inventory = "five" + + expect(video.valid?).must_equal false + end + + it "is not valid when available_inventory is missing" do + video.available_inventory = nil + + expect(video.valid?).must_equal false + end end end From 8c91b7e46f68048b9f27ea4c214eff6fa1e6839a Mon Sep 17 00:00:00 2001 From: Halahaddad1 Date: Thu, 28 May 2020 16:29:01 -0700 Subject: [PATCH 16/16] minor edits to tests --- app/controllers/customers_controller.rb | 32 +------------ app/controllers/rentals_controller.rb | 22 +-------- app/controllers/videos_controller.rb | 6 +-- app/models/rental.rb | 6 +-- app/models/video.rb | 2 +- test/controllers/rentals_controller_test.rb | 50 ++++----------------- test/models/customer_test.rb | 1 - test/models/rental_test.rb | 9 +--- test/models/video_test.rb | 9 ---- 9 files changed, 16 insertions(+), 121 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a904cc43f..7c112c891 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,37 +5,7 @@ def index customers = Customer.order(:name).all.as_json(only: KEYS.sort) render json: customers, status: :ok end - - - # def create - # customer = Customer.new(customer_params) - - # if customer.save - # render json: customer.as_json(only: [:id]), status: :created - # return - # else - # render json: { - # ok: false, - # errors: customer.errors.messages - # }, status: :bad_request - # return - # end - # end - - - # def show - # customer = Customer.find_by(id: params[:id]) - - # if customer - # render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :videos_checked_out_count]) - # return - # else - # render json: { ok: false, errors: ["Not Found"] }, status: :not_found - # return - # end - # end - - + private def customer_params diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9fc31c015..5a2454b82 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,19 +1,8 @@ class RentalsController < ApplicationController - - def checkout rental = Rental.new(rental_params) - # video = Video.find_by(id: rental.video_id) - # p "1111111111#{video.available_inventory}" - # if video.available_inventory.nil? - # render json: { - # errors: ['No inventory available'] - # }, status: :not_found - # return - # end - rental.checked_out = Date.today rental.due_date = rental.checked_out + 7.days if rental.save @@ -26,7 +15,6 @@ def checkout videos_checked_out_count: rental.customer.videos_checked_out_count, available_inventory: rental.video.available_inventory },status: :ok - #(only: [:customer_id, :video_id, :due_date, :rental.customers.videos_checked_out_count, :available_inventory]), return else @@ -38,14 +26,7 @@ def checkout end def checkin - rental = Rental.find_by_customer_id_and_video_id(rental_params[:customer_id],rental_params[:video_id]) - - # puts "rental #{rental.customer_id}" - # puts "customer #{rental_params[:customer_id]}" - # puts "video #{rental_params[:video_id]}" - # Rental.all.each{ |rental| p [rental.customer_id, rental.video_id]} - - + rental = Rental.find_by_customer_id_and_video_id(rental_params[:customer_id],rental_params[:video_id]) if rental rental.checked_in = Date.today else @@ -55,7 +36,6 @@ def checkin return end - if rental.save rental.decrease_count render json: { diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index a300e6c08..2e983b018 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -7,7 +7,6 @@ def index render json: videos, status: :ok end - def create video = Video.new(video_params) if video.save @@ -23,7 +22,7 @@ def create end end -def show + def show video = Video.find_by(id: params[:id]) if video @@ -31,16 +30,13 @@ def show return else render json: { errors: ['Not Found'] }, status: :not_found - # 'errors': ['Not Found'] | AssertionError: expected [ 'ok', 'errors' ] to have the same members as [ 'errors' ] return end end - private def video_params return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end - end \ No newline at end of file diff --git a/app/models/rental.rb b/app/models/rental.rb index 3e19de664..500a24cb6 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -5,12 +5,9 @@ class Rental < ApplicationRecord validates :customer_id, presence: true validates :video_id, presence: true validates :due_date, presence: true - # validates :customer[:videos_checked_out_count], presence: true - # validates :video[:available_inventory], presence: true def add_to_count if self.video.available_inventory.nil? - # chelsea confused here self.video.available_inventory = self.video.total_inventory - 1 self.video.save @@ -25,10 +22,9 @@ def add_to_count end end - def decrease_count if self.checked_out != nil - if self.video.available_inventory == nil # when would this happen? + if self.video.available_inventory == nil return "This video has not been returned yet" else self.video.available_inventory += 1 diff --git a/app/models/video.rb b/app/models/video.rb index d45d6b620..346ae591a 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -6,5 +6,5 @@ class Video < ApplicationRecord validates :overview, presence: true validates :available_inventory, presence: true, numericality: { only_integer: true } validates :total_inventory, presence:true, numericality: true - #TODO double check that total inventory validations are made + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 2e8b75c75..3ac425613 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,12 +4,12 @@ describe "checkout" do before do - customer = Customer.first - video = Video.first + @customer = Customer.first + @video = Video.first @rental_data = { - customer_id: customer.id, - video_id: video.id, + customer_id: @customer.id, + video_id: @video.id, due_date: Date.today + 7.days } end @@ -29,38 +29,6 @@ expect(body[:id]).is_a? Integer end - - - # it "return detailed errors and 400: Bad Request if no available inventory before check out" do - # @rental_data.video.available_inventory = nil - - # post check_out_path, params: @rental_data - - # expect(response.header['Content-Type']).must_include 'json' - # must_respond_with :not_found - # end - - - - - - # it "can assign a checkout_date and change available_inventory and videos_checked_out_count" do - # video_rental = Rental.find_by(video_id: video.id) - # inventory = video_rental.available_inventory - # # checked_out_count = Rental.last.customer.videos_checked_out_count - - # post check_out_path, params: @rental_data - - # body = JSON.parse(response.body) - # must_respond_with :ok - # rental = Rental.find_by(customer_id: body["customer_id"]) - # p "111111111111111111 #{body}" - # expect(rental.video.available_inventory).must_equal (inventory - 1) - # # expect(body["due_date"]).must_equal Date.today + 7.days - - # # expect(rbody["videos_checked_out_count"]).must_equal (checked_out_count - 1) - # end - it "will respond with bad_request for invalid video" do @rental_data[:video_id] = nil @@ -69,7 +37,7 @@ }.wont_change "Rental.count" must_respond_with :not_found - expect(response.header['Content-Type']).must_include 'json' + expect(response.header['Content-Type']).must_include 'json' body = JSON.parse(response.body) expect(body["errors"]).must_equal ["Not Found"] end @@ -91,11 +59,11 @@ describe "checkin" do before do - @video = videos(:video2) - @customer = Customer.first + video = videos(:video2) + customer = Customer.first @rental_data = { - video_id: @video.id, - customer_id: @customer.id + video_id: video.id, + customer_id: customer.id } end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index b378ce090..e31267ddf 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -48,7 +48,6 @@ expect(@customer.valid?).must_equal false end - #registered_at it "is not valid if registered_at is not present" do @customer.registered_at = nil diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 4e14ba2c8..709da61c8 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -6,9 +6,7 @@ @rental = rentals(:rental) @c = customers(:customer1) @v = videos(:video2) - - #puts @c.id - #puts @v.id + end it "belongs to a video" do @@ -24,8 +22,7 @@ before do video = videos(:video2) customer = customers(:customer1) - #puts "this is #{video.id}" - #puts customer.id + @rental = Rental.create(video_id: video.id, customer_id: customer.id, due_date: Date.today) end @@ -46,8 +43,6 @@ expect(@rental.valid?).must_equal false end - - #chelsea added it "is not valid when the due_date is missing" do @rental.due_date = nil diff --git a/test/models/video_test.rb b/test/models/video_test.rb index e014b0cb4..b119e2e56 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -27,14 +27,6 @@ expect(video["available_inventory"]).wont_be_nil end - # it 'testing total_inventory validations' do - - # puts "this is total inventory #{video.total_inventory}" - # expect(video.valid?).must_equal false - - - # end - it "is not valid when title is missing" do video.title = nil @@ -65,7 +57,6 @@ expect(video.valid?).must_equal false end - #chelsea added it "is not valid when available_inventory is not an integer" do video.available_inventory = "five"