From afa3f86d3ce8bc7065e9ca6fd06c30299acaa6c8 Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 15:44:07 -0700 Subject: [PATCH 01/60] rails initial setup --- app/controllers/concerns/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/controllers/concerns/.keep diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb From 2ed378fcc4309165b2edc4e369ab184bb97eb1f1 Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 15:45:08 -0700 Subject: [PATCH 02/60] rails inital setup --- .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/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 | 4 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/migrate/20200526220510_create_videos.rb | 13 ++ db/migrate/20200526221237_create_customers.rb | 15 ++ db/schema.rb | 40 ++++ db/seeds.rb | 2 +- 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, 1208 insertions(+), 1 deletion(-) 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/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/20200526220510_create_videos.rb create mode 100644 db/migrate/20200526221237_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..d7edb5686 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-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/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..29c09c0b7 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +dyvOzfUx/Os4slZ2TUCsYrCBQ314atKGD3UyMPo4cRU5/87NaV/Dp6zrgdb7qySe/JAmTtu6OLFdiBU0OwMyG8NDwzkMM8yDN+nk8Rs2wpdumkSFw27t2kj/Byttq0wCeK0QirvpEU09wO0bXH9KwtxpRZ9AgjNF0NNO8KKcYtWMUBprnC/ib4T6povzXV7EwKhIL2Jrhe8a8aTBxic+kbRWA9bMmARYmm6DZdlY2oaLwAbE0KcppL/tRQjfA+ciRup9FZlpT+SCgX3pSAQEaoQgafB44S1tlbetBswXe5wNIdWFqFFH95vUEuyb2fIusPe0b6bY1cbGXWdguFAf1yS/J6Zw4bdVdBsOvXcEn5raUVmgB7kOdRWGVAcKhlt4FiHMgLdIR7ZrpkD/8P7NMFZujXv6OB0fPDjP--mH6fISQIUTtAvoX0--HOMZWX7ByQWgZdKVfODv6Q== \ 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..3a3499263 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,4 @@ +Rails.application.routes.draw do + + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/migrate/20200526220510_create_videos.rb b/db/migrate/20200526220510_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20200526220510_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/20200526221237_create_customers.rb b/db/migrate/20200526221237_create_customers.rb new file mode 100644 index 000000000..89a48e5a4 --- /dev/null +++ b/db/migrate/20200526221237_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..95cec4f15 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,40 @@ +# 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: 2020_05_26_221237) 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 + 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/db/seeds.rb b/db/seeds.rb index 2ea255387..06003891a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,5 @@ JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - customer['videos_checked_out_count'] = 1 + # customer['videos_checked_out_count'] = 1 Customer.create!(customer) end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 000000000..1a2b97a7f --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "darwin-x64-79", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/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 5f2a0ff07b1ba874a5af2f6401d6950f1a46e03c Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 17:40:55 -0700 Subject: [PATCH 03/60] added routed for Customer and Video models --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 3a3499263..304226f1d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do + resources :customers, only: [:index, :create, :show] + resources :videos, only: [:index, :create, :show] + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From cdfe2cd25ab24f9bdb25f78fa7a48ad5bfcb7cf7 Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 17:41:42 -0700 Subject: [PATCH 04/60] added index, create and show actions for video controller --- app/controllers/videos_controller.rb | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 app/controllers/videos_controller.rb diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..c29aebb85 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,46 @@ +class VideosController < ApplicationController + + def index + + videos = Video.all.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]) + render json: videos, status: :ok + + end + + def create + video = Video.new(video_params) + + if video.save + render json: vidoe.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, :overview, :release_date, :total_inventory, :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 From 6f0c6a25dabe1122cb620bde3bb696a94b9d1882 Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 17:41:54 -0700 Subject: [PATCH 05/60] added index, create and show actions for customer controller --- app/controllers/customers_controller.rb | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 app/controllers/customers_controller.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..9b840e9a8 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,46 @@ +class CustomersController < ApplicationController + + def index + customers = Customer.all.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at]) + 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: video.errors.messages + }, status: :bad_request + return + end + end + + + def show + customer = Customer.find_by(id: params[:id]) + + if custormer + render json: customer.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at]) + return + else + render json: { ok: false, errors: ["Not Found"] }, status: :not_found + return + end + end + + + + private + + def customer_params + return params.require(:customer).permit(:name, :address, :city, :state, :postal_code, :phone, :registered_at) + end + +end From 78c0b388ba0b5c5a89e928da24266525bc39624a Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 17:42:14 -0700 Subject: [PATCH 06/60] test helpers added --- test/controllers/customers_controller_test.rb | 9 +++++++++ test/controllers/videos_controller_test.rb | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/videos_controller_test.rb diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..20069eb1a --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "must get index" do + get customers_index_url + must_respond_with :success + end + +end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..6a451452f --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe VideosController do + it "must get index" do + get videos_index_url + must_respond_with :success + end + +end From 3abc96cf79023b25cb6365ce7da9810e5513113e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Tue, 26 May 2020 18:34:38 -0700 Subject: [PATCH 07/60] added a note --- note.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 note.md diff --git a/note.md b/note.md new file mode 100644 index 000000000..b75e4db4f --- /dev/null +++ b/note.md @@ -0,0 +1 @@ +our to do-es \ No newline at end of file From bf49a07c5cc85ff01d5b0f989e546b40a20e326e Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 20:01:38 -0700 Subject: [PATCH 08/60] added validations for video --- app/models/video.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..27ca0c6a8 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,11 @@ class Video < ApplicationRecord + + belongs_to :customer + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :total_inventory, presence: true + validates :available_inventory, presence: true + end From d11a1d777fac0ed48de8fbe1d4be426359879bb6 Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 20:01:51 -0700 Subject: [PATCH 09/60] added validations for customer --- app/models/customer.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..143cf21d6 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,14 @@ class Customer < ApplicationRecord + + has_many :videos + + validates :name, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + validates :phone, numericality: true + validates :registered_at, presence: true + end From 0b6e5a128f8afa54eae35f87fe90bd28b69e4e24 Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 20:28:49 -0700 Subject: [PATCH 10/60] creared yml file for videos --- test/fixtures/videos.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 test/fixtures/videos.yml diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..603600cad --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,12 @@ +video_1: + title: "Tigers And Kids" + overview: "The secluded life of a elderly woman is going in a different direction as a friendly acquaintance enters her life." + release_date: "2007-03-17" + total_inventory: "6" + available_inventory: "2" +video_2: + title: "Tales Of My Imagination" + overview: "But what if this friendly acquaintance is pulling a prank. Or what if the wrong person was picked for this. How could an ordinary elderly woman play a part in all this. No turning back now though." + release_date: "1985-09-21" + total_inventory: "3" + available_inventory: "2" \ No newline at end of file From 0faba2b31cdcb1b97def5a95caa43601291b74f9 Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 20:29:00 -0700 Subject: [PATCH 11/60] created yml file for customers --- test/fixtures/customers.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 test/fixtures/customers.yml diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..649af8a3c --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,17 @@ +customer_1: + name: "Shelley Rocha" + registered_at: "2015-04-29T14:54:14.000Z" + address: "Ap #292-5216 Ipsum Rd." + city: "Hillsboro" + state: "OR" + postal_code: "24309" + phone: "(322) 510-8695" +customer_2: + name: "Jacqueline Perry" + registered_at: "2015-07-23T17:18:35.000Z" + address: "Ap #288-7228 Dis Rd." + city: "Anchorage" + state: "AK" + postal_code: "99789" + phone: "(479) 207-8414" + From 09c1457638bc77ad5a663c43567b7c55898f3b0d Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 20:42:01 -0700 Subject: [PATCH 12/60] added customer controller test for index --- test/controllers/customers_controller_test.rb | 37 +++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 20069eb1a..7306b1827 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,40 @@ require "test_helper" describe CustomersController do - it "must get index" do - get customers_index_url - must_respond_with :success + + REQUIRED_CUSTOMER_FIELDS = ["id", "name", "address", "city", "state", "postal_code", "phone", "registered_at"].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 "index" do + it "responds with JSON and success" do + get customers_path + + check_response(expected_type: Array) + end + + it "responds with an array ofcustomer hashes" do + # Act + get customers_path + + # Assert + body = check_response(expected_type: Array) + + body.each do |customer| + expect(customer).must_be_instance_of Hash + + expect(customer.keys.sort).must_equal REQUIRED_CUSTOMER_FIELDS + end + end end end From e110d55b579860d4b86c7c550aa1dd6169f1bf4d Mon Sep 17 00:00:00 2001 From: Haben Date: Tue, 26 May 2020 22:15:18 -0700 Subject: [PATCH 13/60] test for customer controller --- test/controllers/customers_controller_test.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 7306b1827..86163a5d8 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -22,7 +22,7 @@ def check_response(expected_type:, expected_status: :success) check_response(expected_type: Array) end - it "responds with an array ofcustomer hashes" do + it "responds with an array of customer hashes" do # Act get customers_path @@ -37,4 +37,16 @@ def check_response(expected_type:, expected_status: :success) end end + it "will respond with an empty array when there are no customers" do + # Arrange + Customer.destroy_all + + # Act + get customers_path + + # Assert + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + end From 36aee94ab4e4f8d0bc3134aab56fca742992ebc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Wed, 27 May 2020 14:06:33 -0700 Subject: [PATCH 14/60] generated rentals --- app/controllers/rentals_controller.rb | 2 + app/controllers/videos_controller.rb | 11 + app/models/rental.rb | 2 + app/models/video.rb | 4 +- config/routes.rb | 1 + db/migrate/20200527210447_create_rentals.rb | 8 + ...stomers and Videos.postman_collection.json | 367 ----------- ...n and Checking Out.postman_collection.json | 612 ------------------ ...e API development.postman_environment.json | 14 - test/controllers/rentals_controller_test.rb | 7 + test/models/rental_test.rb | 7 + 11 files changed, 41 insertions(+), 994 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20200527210447_create_rentals.rb delete mode 100644 test/Video Store API Wave 1- Customers and Videos.postman_collection.json delete mode 100644 test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json delete mode 100644 test/Video Store API development.postman_environment.json create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index c29aebb85..23d6ad95b 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -34,7 +34,18 @@ def show return end end + + # GET /videos/new + def new + @video = Video.new + end + def destroy + @work.destroy + flash[:success] = "Successfully destroyed #{@work.category} #{@work.id}" + redirect_to root_path + + end private diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/app/models/video.rb b/app/models/video.rb index 27ca0c6a8..39d7f6d65 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,6 +1,6 @@ class Video < ApplicationRecord - belongs_to :customer + #has_many: rentals validates :title, presence: true validates :overview, presence: true @@ -9,3 +9,5 @@ class Video < ApplicationRecord validates :available_inventory, presence: true end + + diff --git a/config/routes.rb b/config/routes.rb index 304226f1d..74a4f3360 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do + resources :rentals resources :customers, only: [:index, :create, :show] resources :videos, only: [:index, :create, :show] diff --git a/db/migrate/20200527210447_create_rentals.rb b/db/migrate/20200527210447_create_rentals.rb new file mode 100644 index 000000000..85f45ae24 --- /dev/null +++ b/db/migrate/20200527210447_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/test/Video Store API Wave 1- Customers and Videos.postman_collection.json b/test/Video Store API Wave 1- Customers and Videos.postman_collection.json deleted file mode 100644 index 60c789228..000000000 --- a/test/Video Store API Wave 1- Customers and Videos.postman_collection.json +++ /dev/null @@ -1,367 +0,0 @@ -{ - "info": { - "_postman_id": "8dfaadad-d0be-4331-8b10-4aa732fbfbac", - "name": "Video Store API Wave 1: Customers and Videos", - "description": "Checks the following endpoints:\n\n- GET /customers\n- GET /videos\n- GET /videos/{id}\n- POST /videos", - "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" - }, - "item": [ - { - "name": "Get list of all customers", - "event": [ - { - "listen": "test", - "script": { - "id": "fbc48b66-e17a-40f9-97eb-f861dbab68e5", - "exec": [ - "pm.test(\"response should be OK and come back as an array\", () => {", - " pm.response.to.have.status(200);", - " pm.expect(pm.response.json()).to.be.an('array');", - "});", - "", - "pm.test(\"customer objects in response should have id, name, registered_at, postal_code, phone, videos_checked_out_count\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res[0])).to.have.members(['id', 'name', 'registered_at', 'postal_code', 'phone', 'videos_checked_out_count']);", - "});", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "{{base_url}}/customers", - "host": [ - "{{base_url}}" - ], - "path": [ - "customers" - ] - } - }, - "response": [] - }, - { - "name": "Get list of all videos", - "event": [ - { - "listen": "test", - "script": { - "id": "836d93d8-35c0-402e-8e01-f60c2f733324", - "exec": [ - "pm.test(\"response should be OK and come back as an array\", () => {", - " pm.response.to.have.status(200);", - " pm.expect(pm.response.json()).to.be.an('array');", - "});", - "", - "pm.test(\"video objects in response should have id, title, release_date, available_inventory\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res[0])).to.have.members(['id', 'title', 'release_date', 'available_inventory']);", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "{{base_url}}/videos", - "host": [ - "{{base_url}}" - ], - "path": [ - "videos" - ] - } - }, - "response": [] - }, - { - "name": "Get details on a specific valid video", - "event": [ - { - "listen": "test", - "script": { - "id": "9ff6f203-b3ca-47bd-b4fa-a656e31efb91", - "exec": [ - "pm.test(\"response should be OK and come back as a json object\", () => {", - " pm.response.to.have.status(200);", - " pm.expect(pm.response.json()).to.be.an('object');", - "});", - "", - "pm.test(\"video objects in response should have title, overview, release_date, total_inventory, available_inventory\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['title', 'overview', 'release_date', 'total_inventory', 'available_inventory']);", - "});" - ], - "type": "text/javascript" - } - }, - { - "listen": "prerequest", - "script": { - "id": "1b6a43ec-14f4-4bd4-81c9-b907f3297a2e", - "exec": [ - "// Pre-request script: Find and set a valid existing video ID", - "", - "pm.sendRequest({", - " url: `${ pm.environment.get(\"base_url\") }/videos`,", - " method: 'GET'}, function (err, res) {", - " if (err) {", - " console.log(err);", - " } else {", - " // Setup assertion: for the sake of this tests, there should be at least one video", - " pm.expect(res.json()).to.not.have.lengthOf(0);", - "", - " pm.variables.set(\"valid_video_id\", res.json()[0].id);", - " console.log('An existing video was found with the id', pm.variables.get('valid_video_id'));", - " }", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "GET", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/json", - "type": "text" - } - ], - "url": { - "raw": "{{base_url}}/videos/{{valid_video_id}}", - "host": [ - "{{base_url}}" - ], - "path": [ - "videos", - "{{valid_video_id}}" - ] - } - }, - "response": [] - }, - { - "name": "Get error on a specific invalid video", - "event": [ - { - "listen": "test", - "script": { - "id": "d6b3f657-ad5b-4750-82a9-b3c579e69c5e", - "exec": [ - "pm.test(\"response should be 404 and come back as a json object\", () => {", - " pm.response.to.have.status(404);", - " pm.expect(pm.response.json()).to.be.an('object');", - "});", - "", - "pm.test(\"response should have 'errors': ['Not Found']\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", - " pm.expect(res['errors']).to.have.members(['Not Found']);", - "});" - ], - "type": "text/javascript" - } - }, - { - "listen": "prerequest", - "script": { - "id": "f6807ec9-3341-433e-b17d-353393d4a614", - "exec": [ - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "GET", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/json" - } - ], - "url": { - "raw": "{{base_url}}/videos/-1", - "host": [ - "{{base_url}}" - ], - "path": [ - "videos", - "-1" - ] - } - }, - "response": [] - }, - { - "name": "Creates a video with valid data", - "event": [ - { - "listen": "prerequest", - "script": { - "id": "4a1f2264-8a8d-4309-938b-60d68f58e313", - "exec": [ - "// Generate a unique title for this movie, so that multiple runs don't conflict", - "const uniqueId = Math.random().toString(36).substring(2)", - " + (new Date()).getTime().toString(36);", - "", - "pm.variables.set(\"video_title\", `test_movie_${uniqueId}`);" - ], - "type": "text/javascript" - } - }, - { - "listen": "test", - "script": { - "id": "8a1927e6-46be-44a3-b127-17d47743c398", - "exec": [ - "pm.test(\"response should be 201 and come back as a json object\", () => {", - " pm.response.to.have.status(201);", - " pm.expect(pm.response.json()).to.be.an('object');", - "});", - "", - "pm.test(\"response should give back the id of the newly created video\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['id']);", - "});", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "value": "application/x-www-form-urlencoded" - } - ], - "body": { - "mode": "formdata", - "formdata": [ - { - "key": "title", - "value": "{{video_title}}", - "type": "text" - }, - { - "key": "overview", - "value": "This movie was created by the Postman smoke tests.", - "type": "text" - }, - { - "key": "release_date", - "value": "1990-01-01", - "type": "text" - }, - { - "key": "total_inventory", - "value": "500", - "type": "text" - }, - { - "key": "available_inventory", - "value": "500", - "type": "text" - } - ] - }, - "url": { - "raw": "{{base_url}}/videos", - "host": [ - "{{base_url}}" - ], - "path": [ - "videos" - ] - } - }, - "response": [] - }, - { - "name": "Get errors when creating a video with invalid data", - "event": [ - { - "listen": "test", - "script": { - "id": "cb170430-5945-4d71-8fdc-629721f88d97", - "exec": [ - "pm.test(\"response should be 400 and come back as a json object\", () => {", - " pm.response.to.have.status(400);", - " pm.expect(pm.response.json()).to.be.an('object');", - "});", - "", - "pm.test(\"response should have 'errors' with details on title, overview, release_date, total_inventory, available_inventory required\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", - " pm.expect(Object.keys(res['errors'])).to.have.members(['title', 'overview', 'release_date', 'total_inventory', 'available_inventory']);", - "});" - ], - "type": "text/javascript" - } - }, - { - "listen": "prerequest", - "script": { - "id": "d13c9c80-fb76-4363-be42-bf60186f1a24", - "exec": [ - "// Generate a unique title for this movie, so that multiple runs don't conflict", - "const uniqueId = Math.random().toString(36).substring(2)", - " + (new Date()).getTime().toString(36);", - "", - "pm.environment.set(\"unique_movie_title\", `test_movie_${uniqueId}`);" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "value": "application/x-www-form-urlencoded" - } - ], - "body": { - "mode": "formdata", - "formdata": [] - }, - "url": { - "raw": "{{base_url}}/videos", - "host": [ - "{{base_url}}" - ], - "path": [ - "videos" - ] - } - }, - "response": [] - } - ], - "variable": [ - { - "id": "701d7195-0f4b-4fe5-add1-b8f6eba63b53", - "key": "valid_video_id", - "value": "", - "type": "string" - } - ], - "protocolProfileBehavior": {} -} \ No newline at end of file diff --git a/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json b/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json deleted file mode 100644 index f241dc5ca..000000000 --- a/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json +++ /dev/null @@ -1,612 +0,0 @@ -{ - "info": { - "_postman_id": "690f79cf-484a-4266-8d84-b668aed0c2f4", - "name": "Video Store API Wave 2: Making Rentals with Checking In and Checking Out", - "description": "Checks the following endpoints:\n\n- POST /rentals/check-out\n- POST /rentals/check-in", - "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" - }, - "item": [ - { - "name": "Checks out valid video and customer", - "event": [ - { - "listen": "prerequest", - "script": { - "id": "8b2b72e6-70c5-4ce1-afae-0e0bcb21f23f", - "exec": [ - "// Pre-request script:", - "// 1. Find and test a video that has positive available_inventory value", - "// 2. Find and set valid existing customer ID", - "", - "pm.sendRequest({", - " url: `${ pm.environment.get(\"base_url\") }/customers`,", - " method: 'GET'}, function (err, res) {", - " if (err) {", - " console.log(err);", - " } else {", - " // Setup assertion: for the sake of this test, there should be at least one customer", - " customers = res.json()", - " pm.expect(customers).to.not.have.lengthOf(0);", - "", - " customer = customers[0];", - " console.log(customer);", - " pm.variables.set(\"valid_customer_id\", customer.id);", - "", - " // Get initial values of videos_checked_out_count", - " pm.variables.set(\"original_videos_checked_out\", customer['videos_checked_out_count']);", - " console.log('An existing customer was found with the id', pm.variables.get('valid_customer_id'));", - " console.log('and the original_videos_checked_out', pm.variables.get('original_videos_checked_out'));", - " }", - "});", - "", - "pm.sendRequest({", - " url: `${ pm.environment.get(\"base_url\") }/videos`,", - " method: 'GET'}, function (err, res) {", - " if (err) {", - " console.log(err);", - " } else {", - " // Setup assertion: for the sake of this test, there should be at least one video", - " videos = res.json();", - " pm.expect(videos).to.not.have.lengthOf(0);", - "", - " video = videos[videos.length - 1];", - " console.log(video);", - "", - " // Test that this video needed for the test has a positive available_inventory.", - " // If this fails, re-run this test after creating a new video with ample available inventory", - "", - " pm.variables.set(\"valid_video_id\", video.id);", - "", - " // Get initial values of available_inventory", - " pm.variables.set(\"original_available_inventory\", video['available_inventory']);", - "", - " console.log('An existing video was found with the id', pm.variables.get('valid_video_id'));", - " console.log('and an original_available_inventory', pm.variables.get('original_available_inventory'));", - " }", - "});" - ], - "type": "text/javascript" - } - }, - { - "listen": "test", - "script": { - "id": "5ca8ec82-7aec-4437-a668-78b477dccc4a", - "exec": [ - "pm.test(\"response should be 200 and come back as a json object\", () => {", - " pm.response.to.have.status(200);", - " pm.expect(pm.response.json()).to.be.an('object');", - "});", - "", - "pm.test(\"response should give back the details of check-out: customer_id, video_id, due_date, videos_checked_out_count, available_inventory\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['customer_id', 'video_id', 'due_date', 'videos_checked_out_count', 'available_inventory']);", - "});", - "", - "pm.test(\"request should have incremented videos_checked_out_count, decremented available_inventory\", () => {", - " const res = pm.response.json();", - "", - " pm.expect(res.videos_checked_out_count).to.equal( pm.variables.get('original_videos_checked_out') + 1 );", - " pm.expect(res.available_inventory).to.equal(pm.variables.get('original_available_inventory') - 1);", - "});", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "value": "application/x-www-form-urlencoded" - } - ], - "body": { - "mode": "formdata", - "formdata": [ - { - "key": "customer_id", - "value": "{{valid_customer_id}}", - "type": "text" - }, - { - "key": "video_id", - "value": "{{valid_video_id}}", - "type": "text" - } - ] - }, - "url": { - "raw": "{{base_url}}/rentals/check-out", - "host": [ - "{{base_url}}" - ], - "path": [ - "rentals", - "check-out" - ] - } - }, - "response": [] - }, - { - "name": "Get errors when checking out and invalid customer", - "event": [ - { - "listen": "prerequest", - "script": { - "id": "34a1b6f6-3b91-448a-b396-e612025a2ee8", - "exec": [ - "// Pre-request script:", - "// 1. Find and test a video that has positive available_inventory value", - "", - "pm.sendRequest({", - " url: `${ pm.environment.get(\"base_url\") }/videos`,", - " method: 'GET'}, function (err, res) {", - " if (err) {", - " console.log(err);", - " } else {", - " // Setup assertion: for the sake of this test, there should be at least one video", - " videos = res.json();", - " pm.expect(videos).to.not.have.lengthOf(0);", - "", - " video = videos[videos.length - 1];", - " pm.variables.set(\"valid_video_id\", video.id);", - " console.log('An existing video was found with the id', pm.variables.get('valid_video_id'));", - " }", - "});" - ], - "type": "text/javascript" - } - }, - { - "listen": "test", - "script": { - "id": "bf8d5d2b-8e00-42cf-9bfc-5b4b25454525", - "exec": [ - "pm.test(\"response should be 404 and come back as a json object\", () => {", - " pm.response.to.have.status(404);", - " pm.expect(pm.response.json()).to.be.an('object');", - "});", - "", - "pm.test(\"response should have 'errors': ['Not Found']\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", - " pm.expect(res['errors']).to.have.members(['Not Found']);", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "value": "application/x-www-form-urlencoded" - } - ], - "body": { - "mode": "formdata", - "formdata": [ - { - "key": "customer_id", - "value": "-1", - "type": "text" - }, - { - "key": "video_id", - "value": "{{valid_video_id}}", - "type": "text" - } - ] - }, - "url": { - "raw": "{{base_url}}/rentals/check-out", - "host": [ - "{{base_url}}" - ], - "path": [ - "rentals", - "check-out" - ] - } - }, - "response": [] - }, - { - "name": "Get errors when checking out and invalid video", - "event": [ - { - "listen": "prerequest", - "script": { - "id": "87b2c3ba-669a-41dd-8705-336afba0656a", - "exec": [ - "// Pre-request script:", - "// 1. Find and set valid existing customer ID", - "", - "pm.sendRequest({", - " url: `${ pm.environment.get(\"base_url\") }/customers`,", - " method: 'GET'}, function (err, res) {", - " if (err) {", - " console.log(err);", - " } else {", - " // Setup assertion: for the sake of this test, there should be at least one customer", - " customers = res.json()", - " pm.expect(customers).to.not.have.lengthOf(0);", - "", - " customer = customers[0];", - " pm.variables.set(\"valid_customer_id\", customer.id);", - "", - " // Get initial values of videos_checked_out_count", - " pm.variables.set(\"original_videos_checked_out\", customer['videos_checked_out_count']);", - " console.log('An existing customer was found with the id', pm.variables.get('valid_customer_id'));", - " console.log('and the original_videos_checked_out', pm.variables.get('original_videos_checked_out'));", - " }", - "});" - ], - "type": "text/javascript" - } - }, - { - "listen": "test", - "script": { - "id": "3ddbeb31-c014-46e7-a0cd-86d1b575b8b1", - "exec": [ - "pm.test(\"response should be 404 and come back as a json object\", () => {", - " pm.response.to.have.status(404);", - " pm.expect(pm.response.json()).to.be.an('object');", - "});", - "", - "pm.test(\"response should have 'errors': ['Not Found']\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", - " pm.expect(res['errors']).to.have.members(['Not Found']);", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "value": "application/x-www-form-urlencoded" - } - ], - "body": { - "mode": "formdata", - "formdata": [ - { - "key": "customer_id", - "value": "{{valid_customer_id}}", - "type": "text" - }, - { - "key": "video_id", - "value": "-1", - "type": "text" - } - ] - }, - "url": { - "raw": "{{base_url}}/rentals/check-out", - "host": [ - "{{base_url}}" - ], - "path": [ - "rentals", - "check-out" - ] - } - }, - "response": [] - }, - { - "name": "Checks in valid video and customer", - "event": [ - { - "listen": "prerequest", - "script": { - "id": "4a810fea-4a54-408c-b7f7-2a68b29a6f30", - "exec": [ - "// Pre-request script:", - "// 1. Find and test a video that has positive available_inventory value", - "// 2. Find and set valid existing customer ID", - "", - "pm.sendRequest({", - " url: `${ pm.environment.get(\"base_url\") }/customers`,", - " method: 'GET'}, function (err, res) {", - " if (err) {", - " console.log(err);", - " } else {", - " // Setup assertion: for the sake of this test, there should be at least one customer", - " customers = res.json()", - " pm.expect(customers).to.not.have.lengthOf(0);", - "", - " customer = customers[0];", - " console.log(customer);", - " pm.variables.set(\"valid_customer_id\", customer.id);", - "", - " // Get initial values of videos_checked_out_count", - " pm.variables.set(\"original_videos_checked_out\", customer['videos_checked_out_count']);", - " console.log('An existing customer was found with the id', pm.variables.get('valid_customer_id'));", - " console.log('and the original_videos_checked_out', pm.variables.get('original_videos_checked_out'));", - " }", - "});", - "", - "pm.sendRequest({", - " url: `${ pm.environment.get(\"base_url\") }/videos`,", - " method: 'GET'}, function (err, res) {", - " if (err) {", - " console.log(err);", - " } else {", - " // Setup assertion: for the sake of this test, there should be at least one video", - " videos = res.json();", - " pm.expect(videos).to.not.have.lengthOf(0);", - "", - " video = videos[videos.length - 1];", - " console.log(video);", - "", - " // Test that this video needed for the test has a positive available_inventory.", - " // If this fails, re-run this test after creating a new video with ample available inventory", - "", - " pm.variables.set(\"valid_video_id\", video.id);", - "", - " // Get initial values of available_inventory", - " pm.variables.set(\"original_available_inventory\", video['available_inventory']);", - "", - " console.log('An existing video was found with the id', pm.variables.get('valid_video_id'));", - " console.log('and an original_available_inventory', pm.variables.get('original_available_inventory'));", - " }", - "});" - ], - "type": "text/javascript" - } - }, - { - "listen": "test", - "script": { - "id": "0e14e416-60b1-4d36-8cde-5c76d2169c8f", - "exec": [ - "pm.test(\"response should be 200 and come back as a json object\", () => {", - " pm.response.to.have.status(200);", - " pm.expect(pm.response.json()).to.be.an('object');", - "});", - "", - "pm.test(\"response should give back details of the check-in: customer_id, video_id, videos_checked_out_count, available_inventory\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['customer_id', 'video_id', 'videos_checked_out_count', 'available_inventory']);", - "});", - "", - "pm.test(\"request should have incremented videos_checked_out_count, decremented available_inventory\", () => {", - " const res = pm.response.json();", - "", - " pm.expect(res.videos_checked_out_count).to.equal( pm.variables.get('original_videos_checked_out') - 1 );", - " pm.expect(res.available_inventory).to.equal(pm.variables.get('original_available_inventory') + 1);", - "});", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "value": "application/x-www-form-urlencoded" - } - ], - "body": { - "mode": "formdata", - "formdata": [ - { - "key": "customer_id", - "value": "{{valid_customer_id}}", - "type": "text" - }, - { - "key": "video_id", - "value": "{{valid_video_id}}", - "type": "text" - } - ] - }, - "url": { - "raw": "{{base_url}}/rentals/check-in", - "host": [ - "{{base_url}}" - ], - "path": [ - "rentals", - "check-in" - ] - } - }, - "response": [] - }, - { - "name": "Get errors when checking in and invalid customer", - "event": [ - { - "listen": "prerequest", - "script": { - "id": "26deee94-b703-4ef0-8d16-143b6f8b0a78", - "exec": [ - "// Pre-request script:", - "// 1. Find and test a video that has positive available_inventory value", - "", - "pm.sendRequest({", - " url: `${ pm.environment.get(\"base_url\") }/videos`,", - " method: 'GET'}, function (err, res) {", - " if (err) {", - " console.log(err);", - " } else {", - " // Setup assertion: for the sake of this test, there should be at least one video", - " videos = res.json();", - " pm.expect(videos).to.not.have.lengthOf(0);", - "", - " video = videos[videos.length - 1];", - " pm.variables.set(\"valid_video_id\", video.id);", - " console.log('An existing video was found with the id', pm.variables.get('valid_video_id'));", - " }", - "});" - ], - "type": "text/javascript" - } - }, - { - "listen": "test", - "script": { - "id": "611878f7-a663-47a7-afcc-04c93633f7ea", - "exec": [ - "pm.test(\"response should be 404 and come back as a json object\", () => {", - " pm.response.to.have.status(404);", - " pm.expect(pm.response.json()).to.be.an('object');", - "});", - "", - "pm.test(\"response should have 'errors': ['Not Found']\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", - " pm.expect(res['errors']).to.have.members(['Not Found']);", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "value": "application/x-www-form-urlencoded" - } - ], - "body": { - "mode": "formdata", - "formdata": [ - { - "key": "customer_id", - "value": "-1", - "type": "text" - }, - { - "key": "video_id", - "value": "{{valid_video_id}}", - "type": "text" - } - ] - }, - "url": { - "raw": "{{base_url}}/rentals/check-in", - "host": [ - "{{base_url}}" - ], - "path": [ - "rentals", - "check-in" - ] - } - }, - "response": [] - }, - { - "name": "Get errors when checking out and invalid video Copy", - "event": [ - { - "listen": "prerequest", - "script": { - "id": "54552b89-1abc-407f-9185-095558a230a1", - "exec": [ - "// Pre-request script:", - "// 1. Find and set valid existing customer ID", - "", - "pm.sendRequest({", - " url: `${ pm.environment.get(\"base_url\") }/customers`,", - " method: 'GET'}, function (err, res) {", - " if (err) {", - " console.log(err);", - " } else {", - " // Setup assertion: for the sake of this test, there should be at least one customer", - " customers = res.json()", - " pm.expect(customers).to.not.have.lengthOf(0);", - "", - " customer = customers[0];", - " pm.variables.set(\"valid_customer_id\", customer.id);", - "", - " // Get initial values of videos_checked_out_count", - " pm.variables.set(\"original_videos_checked_out\", customer['videos_checked_out_count']);", - " console.log('An existing customer was found with the id', pm.variables.get('valid_customer_id'));", - " }", - "});" - ], - "type": "text/javascript" - } - }, - { - "listen": "test", - "script": { - "id": "fe0f2905-b489-4c12-a3e5-3be76a6fca11", - "exec": [ - "pm.test(\"response should be 404 and come back as a json object\", () => {", - " pm.response.to.have.status(404);", - " pm.expect(pm.response.json()).to.be.an('object');", - "});", - "", - "pm.test(\"response should have 'errors': ['Not Found']\", () => {", - " const res = pm.response.json();", - " pm.expect(Object.keys(res)).to.have.members(['errors']);", - " pm.expect(res['errors']).to.have.members(['Not Found']);", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "value": "application/x-www-form-urlencoded" - } - ], - "body": { - "mode": "formdata", - "formdata": [ - { - "key": "customer_id", - "value": "{{valid_customer_id}}", - "type": "text" - }, - { - "key": "video_id", - "value": "-1", - "type": "text" - } - ] - }, - "url": { - "raw": "{{base_url}}/rentals/check-in", - "host": [ - "{{base_url}}" - ], - "path": [ - "rentals", - "check-in" - ] - } - }, - "response": [] - } - ], - "protocolProfileBehavior": {} -} \ No newline at end of file diff --git a/test/Video Store API development.postman_environment.json b/test/Video Store API development.postman_environment.json deleted file mode 100644 index f699e97d6..000000000 --- a/test/Video Store API development.postman_environment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "3421676d-b2be-44d8-8028-816661b6fd45", - "name": "Video Store API development", - "values": [ - { - "key": "base_url", - "value": "http://localhost:3000", - "enabled": true - } - ], - "_postman_variable_scope": "environment", - "_postman_exported_at": "2020-05-26T07:03:11.725Z", - "_postman_exported_using": "Postman/7.25.0" -} \ No newline at end of file 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/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 51ee1cf97abe8b231f35db6c657b3333305f1c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Wed, 27 May 2020 16:43:57 -0700 Subject: [PATCH 15/60] added relationships --- app/models/rental.rb | 2 ++ test/fixtures/rentals.yml | 11 +++++++++++ test/models/video_test.rb | 6 ++++++ 3 files changed, 19 insertions(+) create mode 100644 test/fixtures/rentals.yml diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..2420bf8cc 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :video + belongs_to :customer end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..c1c561997 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +rental_1: + customer: Hannah + video: pretty_woman + +rental_2: + customer: Haben + video: man_in_black + +rental_3: + customer: Calder + video: all_things_good \ No newline at end of file diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..c5b716559 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -4,4 +4,10 @@ # it "does a thing" do # value(1+1).must_equal 2 # end +# end + +describe "relationship" do + it "has many rentals" do + + end end From 906574a6c5beaa39cc1309e763dc0cbe6464a1d2 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 16:46:34 -0700 Subject: [PATCH 16/60] added show test for customer --- app/controllers/customers_controller.rb | 32 ++++-------- test/controllers/customers_controller_test.rb | 51 ++++++++++++++----- 2 files changed, 48 insertions(+), 35 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 9b840e9a8..7b94d8cc1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -7,40 +7,30 @@ def index 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: video.errors.messages - }, status: :bad_request - return - end - end - - def show customer = Customer.find_by(id: params[:id]) - if custormer + if customer render json: customer.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at]) return else render json: { ok: false, errors: ["Not Found"] }, status: :not_found return end - end + # customer = Customer.find_by(id: params[:id]) + # if customer.nil? + # render json: { + # # ok: false, + # errors: ["Not Found"], + # }, status: :not_found - private + # return + # end + # render json: customer.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at, :videos_checked_out_count]), + # status: :ok - def customer_params - return params.require(:customer).permit(:name, :address, :city, :state, :postal_code, :phone, :registered_at) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 86163a5d8..debcbcf39 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,20 +1,17 @@ require "test_helper" describe CustomersController do - REQUIRED_CUSTOMER_FIELDS = ["id", "name", "address", "city", "state", "postal_code", "phone", "registered_at"].sort - def check_response(expected_type:, expected_status: :success) must_respond_with expected_status - expect(response.header['Content-Type']).must_include 'json' + 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 "index" do it "responds with JSON and success" do get customers_path @@ -35,18 +32,44 @@ def check_response(expected_type:, expected_status: :success) expect(customer.keys.sort).must_equal REQUIRED_CUSTOMER_FIELDS end 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 + # Act + get customers_path - # Assert - body = check_response(expected_type: Array) - expect(body).must_equal [] - end + # Assert + body = check_response(expected_type: Array) + expect(body).must_equal [] + end +end + + + describe "show" do + # Nominal case + it "will return a hash with the proper fields for an existing customer" do + customer = customers(:customer_1) + + get customers_path(customer.id) + # act + must_respond_with :success + + body = JSON.parse(response.body)[0] + expect(response.header["Content-Type"]).must_include "json" + + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal ["address", "city", "id", "name", "phone","postal_code", "registered_at","state"] + end + + it "will return a 404 request with json for a non-existent customer" do + get customer_path(-1) + must_respond_with :not_found + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body["errors"]).must_equal ["Not Found"] + end + end end From 85189ac67ffc34ff4a9407e53a79640428e7c586 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 16:47:30 -0700 Subject: [PATCH 17/60] minor edit --- app/models/customer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 143cf21d6..5db327840 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,7 @@ class Customer < ApplicationRecord - has_many :videos + has_many :rentals + has_many :videos, through: :rentals validates :name, presence: true validates :address, presence: true @@ -8,7 +9,6 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true - validates :phone, numericality: true validates :registered_at, presence: true end From b6c24449079421651ec17955b7d88e3650b16b49 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 16:47:45 -0700 Subject: [PATCH 18/60] minor edit --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 304226f1d..5f9257e0a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do - resources :customers, only: [:index, :create, :show] + resources :customers, only: [:index, :show] resources :videos, only: [:index, :create, :show] # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html From 21e672a9ac306b8282318e7e85dfc93e9f791814 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 16:50:38 -0700 Subject: [PATCH 19/60] added relationship to video --- app/models/video.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/video.rb b/app/models/video.rb index 27ca0c6a8..0650aa98a 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,6 +1,7 @@ class Video < ApplicationRecord - belongs_to :customer + has_many :rentals + has_many :customers, through: :rentals validates :title, presence: true validates :overview, presence: true From 682c56204c746cdefb0b9262bbd70f000cb54fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Wed, 27 May 2020 16:58:19 -0700 Subject: [PATCH 20/60] did rails db:migrate for rental --- db/schema.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 95cec4f15..bdcceffad 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_221237) do +ActiveRecord::Schema.define(version: 2020_05_27_210447) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -27,6 +27,11 @@ t.datetime "updated_at", precision: 6, null: false end + create_table "rentals", force: :cascade do |t| + 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" From dc54063bb74765c195daba567404a2f3c892c666 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 17:15:54 -0700 Subject: [PATCH 21/60] added relations to rental tables --- .../20200528000644_add_relationship_to_rentals.rb | 6 ++++++ db/schema.rb | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200528000644_add_relationship_to_rentals.rb diff --git a/db/migrate/20200528000644_add_relationship_to_rentals.rb b/db/migrate/20200528000644_add_relationship_to_rentals.rb new file mode 100644 index 000000000..139807180 --- /dev/null +++ b/db/migrate/20200528000644_add_relationship_to_rentals.rb @@ -0,0 +1,6 @@ +class AddRelationshipToRentals < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :video, index: true + add_reference :rentals, :customer, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 95cec4f15..bd5606399 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_221237) do +ActiveRecord::Schema.define(version: 2020_05_28_000644) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -27,6 +27,15 @@ t.datetime "updated_at", precision: 6, null: false end + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "video_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" + end + create_table "videos", force: :cascade do |t| t.string "title" t.string "overview" From 652d28ca0575099d902310198bb70a10b0c599d1 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 19:55:31 -0700 Subject: [PATCH 22/60] added customer model tests --- test/models/customer_test.rb | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..d1ff86218 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,34 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + let (:shelley) {customers(:customer_1)} + + describe "Validation" do + + it "requires name, address, city, state, postal_code, phone, registered_at" do + + required_fields = [:name, :address, :city, :state, :postal_code, :phone, :registered_at] + + required_fields.each do |field| + shelley[field] = nil + + expect(shelley.valid?).must_equal false + + shelley.reload + end + end + end + + describe "Relationship" do + it "has rental" do + + shelley.must_respond_to :rentals + end + + it "customer has video " do + shelley.must_respond_to :videos + end + end + end From adb5688031c7dc8b92f481bbfa49e6a56e021e94 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 19:56:34 -0700 Subject: [PATCH 23/60] edited out show action test for customer controller --- test/controllers/customers_controller_test.rb | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index debcbcf39..c19825f22 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -20,10 +20,8 @@ def check_response(expected_type:, expected_status: :success) end it "responds with an array of customer hashes" do - # Act get customers_path - # Assert body = check_response(expected_type: Array) body.each do |customer| @@ -34,42 +32,12 @@ def check_response(expected_type:, expected_status: :success) end it "will respond with an empty array when there are no customers" do - # Arrange Customer.destroy_all - # Act get customers_path - # Assert body = check_response(expected_type: Array) expect(body).must_equal [] end -end - - - describe "show" do - # Nominal case - it "will return a hash with the proper fields for an existing customer" do - customer = customers(:customer_1) - - get customers_path(customer.id) - # act - must_respond_with :success - - body = JSON.parse(response.body)[0] - - expect(response.header["Content-Type"]).must_include "json" - - expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal ["address", "city", "id", "name", "phone","postal_code", "registered_at","state"] - end - - it "will return a 404 request with json for a non-existent customer" do - get customer_path(-1) - must_respond_with :not_found - body = JSON.parse(response.body) - expect(body).must_be_instance_of Hash - expect(body["errors"]).must_equal ["Not Found"] - end end end From 363c49eaab5e99b392f51b3aa3d533ba58c39a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Wed, 27 May 2020 19:57:16 -0700 Subject: [PATCH 24/60] added show action for video, and wrote the index test --- app/controllers/videos_controller.rb | 41 +++++-------- test/controllers/videos_controller_test.rb | 69 +++++++++++++++++++++- 2 files changed, 82 insertions(+), 28 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 23d6ad95b..dcc2bde0a 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,15 +1,14 @@ class VideosController < ApplicationController def index - - videos = Video.all.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]) - render json: videos, status: :ok - - end + videos = Video.all + render json: videos.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), + status: :ok + end + def create video = Video.new(video_params) - if video.save render json: vidoe.as_json(only: [:id]), status: :created return @@ -26,32 +25,24 @@ def create 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]) + if video.nil? + render json: { + ok: false, + messages: "not found" + }, status: :not_found return - else - render json: { ok: false, errors: ["Not Found"] }, status: :not_found + else + render json: video.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), + status: :ok return - end end - # GET /videos/new - def new - @video = Video.new - end - - def destroy - @work.destroy - flash[:success] = "Successfully destroyed #{@work.category} #{@work.id}" - redirect_to root_path - - end - - + + private def video_params return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end - +end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 6a451452f..5d28b31fa 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,9 +1,72 @@ require "test_helper" describe VideosController do - it "must get index" do - get videos_index_url - must_respond_with :success + + VIDEO_FIELDS = ["id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort + let(:video) {videos(:test)} + + describe "index" do + it "list all the videos" do + get videos_path + must_respond_with :success + end + + it "return json" do + get videos_path + expect (response.header["Content-Type"]).must_include "json" + end + + it "return an Array" do + get videos_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all the proper fields for the videos" do + get videos_path + + body = JSON.parse(response.body) + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end + end + + it "returns all the videos" do + get videos_path + + body = JSON.parse(response.body) + body.length.must_equal Video.count + end + + it "return empty array if there is 0 customers" do + Video.destroy_all + + get videos_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end + + + + + + + + + + + + + + + + + end end From f6358e06780572d27093b46be06801789bd7e05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Wed, 27 May 2020 21:34:19 -0700 Subject: [PATCH 25/60] video show action test passed --- test/controllers/videos_controller_test.rb | 48 +++++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 5d28b31fa..ab1e90a04 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -3,7 +3,7 @@ describe VideosController do VIDEO_FIELDS = ["id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort - let(:video) {videos(:test)} + let(:video) {videos(:video_1)} describe "index" do it "list all the videos" do @@ -50,7 +50,51 @@ expect(body).must_be_instance_of Array expect(body.length).must_equal 0 end + end + + describe "show" do + it "will show one video" do + get videos_path(video) + must_respond_with :success + end + + it "returns a Hash w/the right fields for existing video" do + video = videos(:video_1) + + get video_path(video.id) + + must_respond_with :success + + body = JSON.parse(response.body) + expect(response.header["Content-Type"]).must_include "json" + + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal VIDEO_FIELDS + end + + it "will give error for inexistent video" do + get video_path(-1) + must_respond_with :not_found + + body = JSON.parse(response.body) + + expect(body).must_include "errors" + expect(body["errors"][0]).must_equal "Not Found" + end + end + + # describe "create" do + # let(:video_data){ + # { + # title: "Petty worman", + # overview: "about a girl's dream", + # release_date: 1985 + # available_inventory: + # total_inventory: + # } + # } + # end @@ -67,6 +111,6 @@ - end + end From 20dc986db6da88a7f849d865ecc1acd46cd55eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Wed, 27 May 2020 22:23:20 -0700 Subject: [PATCH 26/60] added post test for video, i failure still, will carry on tomorrow. --- test/controllers/videos_controller_test.rb | 57 +++++++++++++++------- 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index ab1e90a04..50b13aaac 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -84,33 +84,54 @@ end end - # describe "create" do - # let(:video_data){ - # { - # title: "Petty worman", - # overview: "about a girl's dream", - # release_date: 1985 - # available_inventory: - # total_inventory: - # } - # } - # end - - + describe "create video" do + let(:video_data){ + { + video: { + title: "Petty woman", + overview: "about a girl's dream", + release_date: 1985 + # total_inventory: 7, + # available_inventory: 2 + + } + } + } + it "create a video and given a valid data" do + expect { + post videos_path, params: video_data + }.must_change "Video.count",1 + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "title" + video = Video.find_by(title: body["title"]) + must_respond_with :success + end + it "return an error for invalid video data" do + + video_data["title"] = nil + expect{ + post video_path, params: {vidoe: video_data} + }.wont_change "Video.count" + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "error" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end - - - - - + it "can't create a video 0 in inventory" do + video_data[:video] [:available_inventory] = nil + end end From a1dde61ff412f9cb9563213a05b803ccadda8e94 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 22:24:52 -0700 Subject: [PATCH 27/60] added missing API test --- ...stomers and Videos.postman_collection.json | 367 +++++++++++ ...n and Checking Out.postman_collection.json | 612 ++++++++++++++++++ ...e API development.postman_environment.json | 14 + 3 files changed, 993 insertions(+) create mode 100644 test/Video Store API Wave 1- Customers and Videos.postman_collection.json create mode 100644 test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json create mode 100644 test/Video Store API development.postman_environment.json diff --git a/test/Video Store API Wave 1- Customers and Videos.postman_collection.json b/test/Video Store API Wave 1- Customers and Videos.postman_collection.json new file mode 100644 index 000000000..60c789228 --- /dev/null +++ b/test/Video Store API Wave 1- Customers and Videos.postman_collection.json @@ -0,0 +1,367 @@ +{ + "info": { + "_postman_id": "8dfaadad-d0be-4331-8b10-4aa732fbfbac", + "name": "Video Store API Wave 1: Customers and Videos", + "description": "Checks the following endpoints:\n\n- GET /customers\n- GET /videos\n- GET /videos/{id}\n- POST /videos", + "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" + }, + "item": [ + { + "name": "Get list of all customers", + "event": [ + { + "listen": "test", + "script": { + "id": "fbc48b66-e17a-40f9-97eb-f861dbab68e5", + "exec": [ + "pm.test(\"response should be OK and come back as an array\", () => {", + " pm.response.to.have.status(200);", + " pm.expect(pm.response.json()).to.be.an('array');", + "});", + "", + "pm.test(\"customer objects in response should have id, name, registered_at, postal_code, phone, videos_checked_out_count\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res[0])).to.have.members(['id', 'name', 'registered_at', 'postal_code', 'phone', 'videos_checked_out_count']);", + "});", + "" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "GET", + "header": [], + "url": { + "raw": "{{base_url}}/customers", + "host": [ + "{{base_url}}" + ], + "path": [ + "customers" + ] + } + }, + "response": [] + }, + { + "name": "Get list of all videos", + "event": [ + { + "listen": "test", + "script": { + "id": "836d93d8-35c0-402e-8e01-f60c2f733324", + "exec": [ + "pm.test(\"response should be OK and come back as an array\", () => {", + " pm.response.to.have.status(200);", + " pm.expect(pm.response.json()).to.be.an('array');", + "});", + "", + "pm.test(\"video objects in response should have id, title, release_date, available_inventory\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res[0])).to.have.members(['id', 'title', 'release_date', 'available_inventory']);", + "});" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "GET", + "header": [], + "url": { + "raw": "{{base_url}}/videos", + "host": [ + "{{base_url}}" + ], + "path": [ + "videos" + ] + } + }, + "response": [] + }, + { + "name": "Get details on a specific valid video", + "event": [ + { + "listen": "test", + "script": { + "id": "9ff6f203-b3ca-47bd-b4fa-a656e31efb91", + "exec": [ + "pm.test(\"response should be OK and come back as a json object\", () => {", + " pm.response.to.have.status(200);", + " pm.expect(pm.response.json()).to.be.an('object');", + "});", + "", + "pm.test(\"video objects in response should have title, overview, release_date, total_inventory, available_inventory\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res)).to.have.members(['title', 'overview', 'release_date', 'total_inventory', 'available_inventory']);", + "});" + ], + "type": "text/javascript" + } + }, + { + "listen": "prerequest", + "script": { + "id": "1b6a43ec-14f4-4bd4-81c9-b907f3297a2e", + "exec": [ + "// Pre-request script: Find and set a valid existing video ID", + "", + "pm.sendRequest({", + " url: `${ pm.environment.get(\"base_url\") }/videos`,", + " method: 'GET'}, function (err, res) {", + " if (err) {", + " console.log(err);", + " } else {", + " // Setup assertion: for the sake of this tests, there should be at least one video", + " pm.expect(res.json()).to.not.have.lengthOf(0);", + "", + " pm.variables.set(\"valid_video_id\", res.json()[0].id);", + " console.log('An existing video was found with the id', pm.variables.get('valid_video_id'));", + " }", + "});" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "GET", + "header": [ + { + "key": "Content-Type", + "name": "Content-Type", + "value": "application/json", + "type": "text" + } + ], + "url": { + "raw": "{{base_url}}/videos/{{valid_video_id}}", + "host": [ + "{{base_url}}" + ], + "path": [ + "videos", + "{{valid_video_id}}" + ] + } + }, + "response": [] + }, + { + "name": "Get error on a specific invalid video", + "event": [ + { + "listen": "test", + "script": { + "id": "d6b3f657-ad5b-4750-82a9-b3c579e69c5e", + "exec": [ + "pm.test(\"response should be 404 and come back as a json object\", () => {", + " pm.response.to.have.status(404);", + " pm.expect(pm.response.json()).to.be.an('object');", + "});", + "", + "pm.test(\"response should have 'errors': ['Not Found']\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res)).to.have.members(['errors']);", + " pm.expect(res['errors']).to.have.members(['Not Found']);", + "});" + ], + "type": "text/javascript" + } + }, + { + "listen": "prerequest", + "script": { + "id": "f6807ec9-3341-433e-b17d-353393d4a614", + "exec": [ + "" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "GET", + "header": [ + { + "key": "Content-Type", + "name": "Content-Type", + "type": "text", + "value": "application/json" + } + ], + "url": { + "raw": "{{base_url}}/videos/-1", + "host": [ + "{{base_url}}" + ], + "path": [ + "videos", + "-1" + ] + } + }, + "response": [] + }, + { + "name": "Creates a video with valid data", + "event": [ + { + "listen": "prerequest", + "script": { + "id": "4a1f2264-8a8d-4309-938b-60d68f58e313", + "exec": [ + "// Generate a unique title for this movie, so that multiple runs don't conflict", + "const uniqueId = Math.random().toString(36).substring(2)", + " + (new Date()).getTime().toString(36);", + "", + "pm.variables.set(\"video_title\", `test_movie_${uniqueId}`);" + ], + "type": "text/javascript" + } + }, + { + "listen": "test", + "script": { + "id": "8a1927e6-46be-44a3-b127-17d47743c398", + "exec": [ + "pm.test(\"response should be 201 and come back as a json object\", () => {", + " pm.response.to.have.status(201);", + " pm.expect(pm.response.json()).to.be.an('object');", + "});", + "", + "pm.test(\"response should give back the id of the newly created video\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res)).to.have.members(['id']);", + "});", + "" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/x-www-form-urlencoded" + } + ], + "body": { + "mode": "formdata", + "formdata": [ + { + "key": "title", + "value": "{{video_title}}", + "type": "text" + }, + { + "key": "overview", + "value": "This movie was created by the Postman smoke tests.", + "type": "text" + }, + { + "key": "release_date", + "value": "1990-01-01", + "type": "text" + }, + { + "key": "total_inventory", + "value": "500", + "type": "text" + }, + { + "key": "available_inventory", + "value": "500", + "type": "text" + } + ] + }, + "url": { + "raw": "{{base_url}}/videos", + "host": [ + "{{base_url}}" + ], + "path": [ + "videos" + ] + } + }, + "response": [] + }, + { + "name": "Get errors when creating a video with invalid data", + "event": [ + { + "listen": "test", + "script": { + "id": "cb170430-5945-4d71-8fdc-629721f88d97", + "exec": [ + "pm.test(\"response should be 400 and come back as a json object\", () => {", + " pm.response.to.have.status(400);", + " pm.expect(pm.response.json()).to.be.an('object');", + "});", + "", + "pm.test(\"response should have 'errors' with details on title, overview, release_date, total_inventory, available_inventory required\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res)).to.have.members(['errors']);", + " pm.expect(Object.keys(res['errors'])).to.have.members(['title', 'overview', 'release_date', 'total_inventory', 'available_inventory']);", + "});" + ], + "type": "text/javascript" + } + }, + { + "listen": "prerequest", + "script": { + "id": "d13c9c80-fb76-4363-be42-bf60186f1a24", + "exec": [ + "// Generate a unique title for this movie, so that multiple runs don't conflict", + "const uniqueId = Math.random().toString(36).substring(2)", + " + (new Date()).getTime().toString(36);", + "", + "pm.environment.set(\"unique_movie_title\", `test_movie_${uniqueId}`);" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/x-www-form-urlencoded" + } + ], + "body": { + "mode": "formdata", + "formdata": [] + }, + "url": { + "raw": "{{base_url}}/videos", + "host": [ + "{{base_url}}" + ], + "path": [ + "videos" + ] + } + }, + "response": [] + } + ], + "variable": [ + { + "id": "701d7195-0f4b-4fe5-add1-b8f6eba63b53", + "key": "valid_video_id", + "value": "", + "type": "string" + } + ], + "protocolProfileBehavior": {} +} \ No newline at end of file diff --git a/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json b/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json new file mode 100644 index 000000000..f241dc5ca --- /dev/null +++ b/test/Video Store API Wave 2- Making Rentals with Checking In and Checking Out.postman_collection.json @@ -0,0 +1,612 @@ +{ + "info": { + "_postman_id": "690f79cf-484a-4266-8d84-b668aed0c2f4", + "name": "Video Store API Wave 2: Making Rentals with Checking In and Checking Out", + "description": "Checks the following endpoints:\n\n- POST /rentals/check-out\n- POST /rentals/check-in", + "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" + }, + "item": [ + { + "name": "Checks out valid video and customer", + "event": [ + { + "listen": "prerequest", + "script": { + "id": "8b2b72e6-70c5-4ce1-afae-0e0bcb21f23f", + "exec": [ + "// Pre-request script:", + "// 1. Find and test a video that has positive available_inventory value", + "// 2. Find and set valid existing customer ID", + "", + "pm.sendRequest({", + " url: `${ pm.environment.get(\"base_url\") }/customers`,", + " method: 'GET'}, function (err, res) {", + " if (err) {", + " console.log(err);", + " } else {", + " // Setup assertion: for the sake of this test, there should be at least one customer", + " customers = res.json()", + " pm.expect(customers).to.not.have.lengthOf(0);", + "", + " customer = customers[0];", + " console.log(customer);", + " pm.variables.set(\"valid_customer_id\", customer.id);", + "", + " // Get initial values of videos_checked_out_count", + " pm.variables.set(\"original_videos_checked_out\", customer['videos_checked_out_count']);", + " console.log('An existing customer was found with the id', pm.variables.get('valid_customer_id'));", + " console.log('and the original_videos_checked_out', pm.variables.get('original_videos_checked_out'));", + " }", + "});", + "", + "pm.sendRequest({", + " url: `${ pm.environment.get(\"base_url\") }/videos`,", + " method: 'GET'}, function (err, res) {", + " if (err) {", + " console.log(err);", + " } else {", + " // Setup assertion: for the sake of this test, there should be at least one video", + " videos = res.json();", + " pm.expect(videos).to.not.have.lengthOf(0);", + "", + " video = videos[videos.length - 1];", + " console.log(video);", + "", + " // Test that this video needed for the test has a positive available_inventory.", + " // If this fails, re-run this test after creating a new video with ample available inventory", + "", + " pm.variables.set(\"valid_video_id\", video.id);", + "", + " // Get initial values of available_inventory", + " pm.variables.set(\"original_available_inventory\", video['available_inventory']);", + "", + " console.log('An existing video was found with the id', pm.variables.get('valid_video_id'));", + " console.log('and an original_available_inventory', pm.variables.get('original_available_inventory'));", + " }", + "});" + ], + "type": "text/javascript" + } + }, + { + "listen": "test", + "script": { + "id": "5ca8ec82-7aec-4437-a668-78b477dccc4a", + "exec": [ + "pm.test(\"response should be 200 and come back as a json object\", () => {", + " pm.response.to.have.status(200);", + " pm.expect(pm.response.json()).to.be.an('object');", + "});", + "", + "pm.test(\"response should give back the details of check-out: customer_id, video_id, due_date, videos_checked_out_count, available_inventory\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res)).to.have.members(['customer_id', 'video_id', 'due_date', 'videos_checked_out_count', 'available_inventory']);", + "});", + "", + "pm.test(\"request should have incremented videos_checked_out_count, decremented available_inventory\", () => {", + " const res = pm.response.json();", + "", + " pm.expect(res.videos_checked_out_count).to.equal( pm.variables.get('original_videos_checked_out') + 1 );", + " pm.expect(res.available_inventory).to.equal(pm.variables.get('original_available_inventory') - 1);", + "});", + "" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/x-www-form-urlencoded" + } + ], + "body": { + "mode": "formdata", + "formdata": [ + { + "key": "customer_id", + "value": "{{valid_customer_id}}", + "type": "text" + }, + { + "key": "video_id", + "value": "{{valid_video_id}}", + "type": "text" + } + ] + }, + "url": { + "raw": "{{base_url}}/rentals/check-out", + "host": [ + "{{base_url}}" + ], + "path": [ + "rentals", + "check-out" + ] + } + }, + "response": [] + }, + { + "name": "Get errors when checking out and invalid customer", + "event": [ + { + "listen": "prerequest", + "script": { + "id": "34a1b6f6-3b91-448a-b396-e612025a2ee8", + "exec": [ + "// Pre-request script:", + "// 1. Find and test a video that has positive available_inventory value", + "", + "pm.sendRequest({", + " url: `${ pm.environment.get(\"base_url\") }/videos`,", + " method: 'GET'}, function (err, res) {", + " if (err) {", + " console.log(err);", + " } else {", + " // Setup assertion: for the sake of this test, there should be at least one video", + " videos = res.json();", + " pm.expect(videos).to.not.have.lengthOf(0);", + "", + " video = videos[videos.length - 1];", + " pm.variables.set(\"valid_video_id\", video.id);", + " console.log('An existing video was found with the id', pm.variables.get('valid_video_id'));", + " }", + "});" + ], + "type": "text/javascript" + } + }, + { + "listen": "test", + "script": { + "id": "bf8d5d2b-8e00-42cf-9bfc-5b4b25454525", + "exec": [ + "pm.test(\"response should be 404 and come back as a json object\", () => {", + " pm.response.to.have.status(404);", + " pm.expect(pm.response.json()).to.be.an('object');", + "});", + "", + "pm.test(\"response should have 'errors': ['Not Found']\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res)).to.have.members(['errors']);", + " pm.expect(res['errors']).to.have.members(['Not Found']);", + "});" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/x-www-form-urlencoded" + } + ], + "body": { + "mode": "formdata", + "formdata": [ + { + "key": "customer_id", + "value": "-1", + "type": "text" + }, + { + "key": "video_id", + "value": "{{valid_video_id}}", + "type": "text" + } + ] + }, + "url": { + "raw": "{{base_url}}/rentals/check-out", + "host": [ + "{{base_url}}" + ], + "path": [ + "rentals", + "check-out" + ] + } + }, + "response": [] + }, + { + "name": "Get errors when checking out and invalid video", + "event": [ + { + "listen": "prerequest", + "script": { + "id": "87b2c3ba-669a-41dd-8705-336afba0656a", + "exec": [ + "// Pre-request script:", + "// 1. Find and set valid existing customer ID", + "", + "pm.sendRequest({", + " url: `${ pm.environment.get(\"base_url\") }/customers`,", + " method: 'GET'}, function (err, res) {", + " if (err) {", + " console.log(err);", + " } else {", + " // Setup assertion: for the sake of this test, there should be at least one customer", + " customers = res.json()", + " pm.expect(customers).to.not.have.lengthOf(0);", + "", + " customer = customers[0];", + " pm.variables.set(\"valid_customer_id\", customer.id);", + "", + " // Get initial values of videos_checked_out_count", + " pm.variables.set(\"original_videos_checked_out\", customer['videos_checked_out_count']);", + " console.log('An existing customer was found with the id', pm.variables.get('valid_customer_id'));", + " console.log('and the original_videos_checked_out', pm.variables.get('original_videos_checked_out'));", + " }", + "});" + ], + "type": "text/javascript" + } + }, + { + "listen": "test", + "script": { + "id": "3ddbeb31-c014-46e7-a0cd-86d1b575b8b1", + "exec": [ + "pm.test(\"response should be 404 and come back as a json object\", () => {", + " pm.response.to.have.status(404);", + " pm.expect(pm.response.json()).to.be.an('object');", + "});", + "", + "pm.test(\"response should have 'errors': ['Not Found']\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res)).to.have.members(['errors']);", + " pm.expect(res['errors']).to.have.members(['Not Found']);", + "});" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/x-www-form-urlencoded" + } + ], + "body": { + "mode": "formdata", + "formdata": [ + { + "key": "customer_id", + "value": "{{valid_customer_id}}", + "type": "text" + }, + { + "key": "video_id", + "value": "-1", + "type": "text" + } + ] + }, + "url": { + "raw": "{{base_url}}/rentals/check-out", + "host": [ + "{{base_url}}" + ], + "path": [ + "rentals", + "check-out" + ] + } + }, + "response": [] + }, + { + "name": "Checks in valid video and customer", + "event": [ + { + "listen": "prerequest", + "script": { + "id": "4a810fea-4a54-408c-b7f7-2a68b29a6f30", + "exec": [ + "// Pre-request script:", + "// 1. Find and test a video that has positive available_inventory value", + "// 2. Find and set valid existing customer ID", + "", + "pm.sendRequest({", + " url: `${ pm.environment.get(\"base_url\") }/customers`,", + " method: 'GET'}, function (err, res) {", + " if (err) {", + " console.log(err);", + " } else {", + " // Setup assertion: for the sake of this test, there should be at least one customer", + " customers = res.json()", + " pm.expect(customers).to.not.have.lengthOf(0);", + "", + " customer = customers[0];", + " console.log(customer);", + " pm.variables.set(\"valid_customer_id\", customer.id);", + "", + " // Get initial values of videos_checked_out_count", + " pm.variables.set(\"original_videos_checked_out\", customer['videos_checked_out_count']);", + " console.log('An existing customer was found with the id', pm.variables.get('valid_customer_id'));", + " console.log('and the original_videos_checked_out', pm.variables.get('original_videos_checked_out'));", + " }", + "});", + "", + "pm.sendRequest({", + " url: `${ pm.environment.get(\"base_url\") }/videos`,", + " method: 'GET'}, function (err, res) {", + " if (err) {", + " console.log(err);", + " } else {", + " // Setup assertion: for the sake of this test, there should be at least one video", + " videos = res.json();", + " pm.expect(videos).to.not.have.lengthOf(0);", + "", + " video = videos[videos.length - 1];", + " console.log(video);", + "", + " // Test that this video needed for the test has a positive available_inventory.", + " // If this fails, re-run this test after creating a new video with ample available inventory", + "", + " pm.variables.set(\"valid_video_id\", video.id);", + "", + " // Get initial values of available_inventory", + " pm.variables.set(\"original_available_inventory\", video['available_inventory']);", + "", + " console.log('An existing video was found with the id', pm.variables.get('valid_video_id'));", + " console.log('and an original_available_inventory', pm.variables.get('original_available_inventory'));", + " }", + "});" + ], + "type": "text/javascript" + } + }, + { + "listen": "test", + "script": { + "id": "0e14e416-60b1-4d36-8cde-5c76d2169c8f", + "exec": [ + "pm.test(\"response should be 200 and come back as a json object\", () => {", + " pm.response.to.have.status(200);", + " pm.expect(pm.response.json()).to.be.an('object');", + "});", + "", + "pm.test(\"response should give back details of the check-in: customer_id, video_id, videos_checked_out_count, available_inventory\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res)).to.have.members(['customer_id', 'video_id', 'videos_checked_out_count', 'available_inventory']);", + "});", + "", + "pm.test(\"request should have incremented videos_checked_out_count, decremented available_inventory\", () => {", + " const res = pm.response.json();", + "", + " pm.expect(res.videos_checked_out_count).to.equal( pm.variables.get('original_videos_checked_out') - 1 );", + " pm.expect(res.available_inventory).to.equal(pm.variables.get('original_available_inventory') + 1);", + "});", + "" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/x-www-form-urlencoded" + } + ], + "body": { + "mode": "formdata", + "formdata": [ + { + "key": "customer_id", + "value": "{{valid_customer_id}}", + "type": "text" + }, + { + "key": "video_id", + "value": "{{valid_video_id}}", + "type": "text" + } + ] + }, + "url": { + "raw": "{{base_url}}/rentals/check-in", + "host": [ + "{{base_url}}" + ], + "path": [ + "rentals", + "check-in" + ] + } + }, + "response": [] + }, + { + "name": "Get errors when checking in and invalid customer", + "event": [ + { + "listen": "prerequest", + "script": { + "id": "26deee94-b703-4ef0-8d16-143b6f8b0a78", + "exec": [ + "// Pre-request script:", + "// 1. Find and test a video that has positive available_inventory value", + "", + "pm.sendRequest({", + " url: `${ pm.environment.get(\"base_url\") }/videos`,", + " method: 'GET'}, function (err, res) {", + " if (err) {", + " console.log(err);", + " } else {", + " // Setup assertion: for the sake of this test, there should be at least one video", + " videos = res.json();", + " pm.expect(videos).to.not.have.lengthOf(0);", + "", + " video = videos[videos.length - 1];", + " pm.variables.set(\"valid_video_id\", video.id);", + " console.log('An existing video was found with the id', pm.variables.get('valid_video_id'));", + " }", + "});" + ], + "type": "text/javascript" + } + }, + { + "listen": "test", + "script": { + "id": "611878f7-a663-47a7-afcc-04c93633f7ea", + "exec": [ + "pm.test(\"response should be 404 and come back as a json object\", () => {", + " pm.response.to.have.status(404);", + " pm.expect(pm.response.json()).to.be.an('object');", + "});", + "", + "pm.test(\"response should have 'errors': ['Not Found']\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res)).to.have.members(['errors']);", + " pm.expect(res['errors']).to.have.members(['Not Found']);", + "});" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/x-www-form-urlencoded" + } + ], + "body": { + "mode": "formdata", + "formdata": [ + { + "key": "customer_id", + "value": "-1", + "type": "text" + }, + { + "key": "video_id", + "value": "{{valid_video_id}}", + "type": "text" + } + ] + }, + "url": { + "raw": "{{base_url}}/rentals/check-in", + "host": [ + "{{base_url}}" + ], + "path": [ + "rentals", + "check-in" + ] + } + }, + "response": [] + }, + { + "name": "Get errors when checking out and invalid video Copy", + "event": [ + { + "listen": "prerequest", + "script": { + "id": "54552b89-1abc-407f-9185-095558a230a1", + "exec": [ + "// Pre-request script:", + "// 1. Find and set valid existing customer ID", + "", + "pm.sendRequest({", + " url: `${ pm.environment.get(\"base_url\") }/customers`,", + " method: 'GET'}, function (err, res) {", + " if (err) {", + " console.log(err);", + " } else {", + " // Setup assertion: for the sake of this test, there should be at least one customer", + " customers = res.json()", + " pm.expect(customers).to.not.have.lengthOf(0);", + "", + " customer = customers[0];", + " pm.variables.set(\"valid_customer_id\", customer.id);", + "", + " // Get initial values of videos_checked_out_count", + " pm.variables.set(\"original_videos_checked_out\", customer['videos_checked_out_count']);", + " console.log('An existing customer was found with the id', pm.variables.get('valid_customer_id'));", + " }", + "});" + ], + "type": "text/javascript" + } + }, + { + "listen": "test", + "script": { + "id": "fe0f2905-b489-4c12-a3e5-3be76a6fca11", + "exec": [ + "pm.test(\"response should be 404 and come back as a json object\", () => {", + " pm.response.to.have.status(404);", + " pm.expect(pm.response.json()).to.be.an('object');", + "});", + "", + "pm.test(\"response should have 'errors': ['Not Found']\", () => {", + " const res = pm.response.json();", + " pm.expect(Object.keys(res)).to.have.members(['errors']);", + " pm.expect(res['errors']).to.have.members(['Not Found']);", + "});" + ], + "type": "text/javascript" + } + } + ], + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/x-www-form-urlencoded" + } + ], + "body": { + "mode": "formdata", + "formdata": [ + { + "key": "customer_id", + "value": "{{valid_customer_id}}", + "type": "text" + }, + { + "key": "video_id", + "value": "-1", + "type": "text" + } + ] + }, + "url": { + "raw": "{{base_url}}/rentals/check-in", + "host": [ + "{{base_url}}" + ], + "path": [ + "rentals", + "check-in" + ] + } + }, + "response": [] + } + ], + "protocolProfileBehavior": {} +} \ No newline at end of file diff --git a/test/Video Store API development.postman_environment.json b/test/Video Store API development.postman_environment.json new file mode 100644 index 000000000..f699e97d6 --- /dev/null +++ b/test/Video Store API development.postman_environment.json @@ -0,0 +1,14 @@ +{ + "id": "3421676d-b2be-44d8-8028-816661b6fd45", + "name": "Video Store API development", + "values": [ + { + "key": "base_url", + "value": "http://localhost:3000", + "enabled": true + } + ], + "_postman_variable_scope": "environment", + "_postman_exported_at": "2020-05-26T07:03:11.725Z", + "_postman_exported_using": "Postman/7.25.0" +} \ No newline at end of file From 3156a3dfb170a66f0deb7f52372ff022d09d2f41 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 22:25:51 -0700 Subject: [PATCH 28/60] editedd the index action's required fields --- app/controllers/customers_controller.rb | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 7b94d8cc1..4afe8c335 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController - def index - customers = Customer.all.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at]) + def index + customers = Customer.order(:name).as_json(only: [:id, :name, :postal_code, :phone, :registered_at, :videos_checked_out_count]) render json: customers, status: :ok end @@ -18,19 +18,6 @@ def show return end - # customer = Customer.find_by(id: params[:id]) - - # if customer.nil? - # render json: { - # # ok: false, - # errors: ["Not Found"], - # }, status: :not_found - - # return - # end - # render json: customer.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at, :videos_checked_out_count]), - # status: :ok - end end From 28959ad2ffc81e38348e6629e6e1873290f6708c Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 22:26:20 -0700 Subject: [PATCH 29/60] added checkout method for rental controller --- app/controllers/rentals_controller.rb | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..749170cd0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,37 @@ class RentalsController < ApplicationController + + + def check_out + rental = Rental.new(rentals_params) + video = Video.find_by(id: rentals_params[:video_id]) + customer = Customer.find_by(id: rentals_params[:customer_id]) + + if customer.nil? + render json: {errors: ["Not Found"] }, status: :not_found + return + end + + if video.available_inventory > 0 + rental.save + + video.available_inventory -= 1 + video.save + + customer.checked_out_count += 1 + customer.save + end + + return rental end + + + + def check_in + end + + def rentals_params + return params.permit(:customer_id, :video_id) + end +end + + From 5cd927dc47e603e09929cb647bd0c63a9563ea92 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 22:27:28 -0700 Subject: [PATCH 30/60] edited video controller index action's required fields to match smoke test's --- app/controllers/videos_controller.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 23d6ad95b..e6ee690c2 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,8 +1,8 @@ class VideosController < ApplicationController - def index + def index - videos = Video.all.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]) + videos = Video.order(:title).as_json(only: [:id, :title, :release_date, :available_inventory]) render json: videos, status: :ok end @@ -10,12 +10,12 @@ def index def create video = Video.new(video_params) - if video.save + if video.save render json: vidoe.as_json(only: [:id]), status: :created return else render json: { - ok: false, + errors: video.errors.messages }, status: :bad_request return @@ -26,11 +26,11 @@ def create 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]) + if video + render json: video.as_json(only: [ :title, :overview, :release_date, :total_inventory, :available_inventory]) return else - render json: { ok: false, errors: ["Not Found"] }, status: :not_found + render json: {errors: ["Not Found"] }, status: :not_found return end end @@ -51,7 +51,7 @@ def destroy 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 From a2c13742ad3c6cb1b6e572898c865380e68a0f39 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 22:28:27 -0700 Subject: [PATCH 31/60] added check-out and check-in to routes and made video as root route --- config/routes.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 74a4f3360..662bd3ba9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,5 +4,10 @@ resources :customers, only: [:index, :create, :show] resources :videos, only: [:index, :create, :show] + post "/rentals/check-out", to: "rentals#check_out", as: "check-out" + post "/rentals/check-in", to: "rentals#check_in", as: "check-in" + + root "videos#index" + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From 61f210c7bfac06d6d847c48a0c7dfe22529b8a50 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 22:29:16 -0700 Subject: [PATCH 32/60] added video_checkedout_count to the schema --- db/schema.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index bd5606399..5697c8574 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_28_000644) do +ActiveRecord::Schema.define(version: 2020_05_28_040327) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count" end create_table "rentals", force: :cascade do |t| From 08362f9679adef66d581beb98a04d3deca45cf1d Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 22:29:47 -0700 Subject: [PATCH 33/60] uncommented video_checkedout_count in seeds --- db/seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 06003891a..2ea255387 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,5 @@ JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - # customer['videos_checked_out_count'] = 1 + customer['videos_checked_out_count'] = 1 Customer.create!(customer) end From 27c997e13d9629a858e3cf7ee0d8f4ee0fb3b817 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 22:32:42 -0700 Subject: [PATCH 34/60] added video_checkedout_count as a table --- db/migrate/20200528040327_add_video_checked_out_count.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20200528040327_add_video_checked_out_count.rb diff --git a/db/migrate/20200528040327_add_video_checked_out_count.rb b/db/migrate/20200528040327_add_video_checked_out_count.rb new file mode 100644 index 000000000..8b9490f4f --- /dev/null +++ b/db/migrate/20200528040327_add_video_checked_out_count.rb @@ -0,0 +1,5 @@ +class AddVideoCheckedOutCount < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end From f24073e9b19ae6662f3a713069d3451b34c1fea9 Mon Sep 17 00:00:00 2001 From: Haben Date: Wed, 27 May 2020 22:34:25 -0700 Subject: [PATCH 35/60] minor edits --- app/models/rental.rb | 1 + test/controllers/rentals_controller_test.rb | 3 +++ test/fixtures/customers.yml | 2 +- test/models/video_test.rb | 4 ---- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 2420bf8cc..e59b086a5 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,5 @@ class Rental < ApplicationRecord belongs_to :video belongs_to :customer + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..096105d67 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,4 +4,7 @@ # it "does a thing" do # value(1+1).must_equal 2 # end + + # check_in + # check_out end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 649af8a3c..fdb3ac1b7 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,4 +1,4 @@ -customer_1: +customer_1: name: "Shelley Rocha" registered_at: "2015-04-29T14:54:14.000Z" address: "Ap #292-5216 Ipsum Rd." diff --git a/test/models/video_test.rb b/test/models/video_test.rb index c5b716559..5cd4e26b4 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,10 +1,6 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end -# end describe "relationship" do it "has many rentals" do From 7f308a712d6de7aa79645901f8c55edb0f1dab89 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 14:05:55 -0700 Subject: [PATCH 36/60] added checked_in method in rentals_controller --- app/controllers/rentals_controller.rb | 33 ++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 749170cd0..a1453992a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -26,7 +26,38 @@ def check_out - def check_in + def check_in + rentals = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id], check_in_date: nil) + video = Video.find_by(id: params[:video_id]) + customer = Customer.find_by(id: params[:customer_id]) + + + if rental.nil? + render json: {errors: ["Rental not Found"] }, status: :bad_request + return + end + + rental.check_in_date = Date.today # check if this is neccessary + + if rental.save + video.increase_inventory + customer.remove_checked_out + render json: {customer_id: rental.customer_id, + video_id: rental.video_id, videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory}, status: :ok + return + else + render json: { ok: false, errors: rental.errors.messages }, status: :bad_request + return + end + + + # customer.checked_in_count -= 1 + # movie.available_inventory += 1 + + # customer.save + # video.save + end def rentals_params From 42ae078158b72e1afca5afc009ac7a4979b154ee Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 17:28:34 -0700 Subject: [PATCH 37/60] edited yml for all 3 --- test/fixtures/customers.yml | 2 ++ test/fixtures/rentals.yml | 11 ++++------- test/fixtures/videos.yml | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index fdb3ac1b7..591efe89a 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -6,6 +6,7 @@ customer_1: state: "OR" postal_code: "24309" phone: "(322) 510-8695" + videos_checked_out_count: 1 customer_2: name: "Jacqueline Perry" registered_at: "2015-07-23T17:18:35.000Z" @@ -14,4 +15,5 @@ customer_2: state: "AK" postal_code: "99789" phone: "(479) 207-8414" + videos_checked_out_count: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index c1c561997..938b7b881 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,11 +1,8 @@ rental_1: - customer: Hannah - video: pretty_woman + customer: customer_1 + video: video_1 rental_2: - customer: Haben - video: man_in_black + customer: customer_2 + video: video_2 -rental_3: - customer: Calder - video: all_things_good \ No newline at end of file diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml index 603600cad..cceee410e 100644 --- a/test/fixtures/videos.yml +++ b/test/fixtures/videos.yml @@ -2,8 +2,8 @@ video_1: title: "Tigers And Kids" overview: "The secluded life of a elderly woman is going in a different direction as a friendly acquaintance enters her life." release_date: "2007-03-17" - total_inventory: "6" - available_inventory: "2" + total_inventory: "5" + available_inventory: "4" video_2: title: "Tales Of My Imagination" overview: "But what if this friendly acquaintance is pulling a prank. Or what if the wrong person was picked for this. How could an ordinary elderly woman play a part in all this. No turning back now though." From 28ada53257b558f57cea77b24edc6bb4dacf5496 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 17:29:18 -0700 Subject: [PATCH 38/60] added test for rental controller for index and check_out --- test/controllers/rentals_controller_test.rb | 81 +++++++++++++++++++-- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 096105d67..a9eba7fbd 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,10 +1,79 @@ require "test_helper" -describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end +describe RentalsController do # "check_in_date" "check_out_date", + REQUIRED_RENTALS_FIELDS = ["id", "customer_id", "video_id", "checked_in_date", "checked_out_date", "created_at", "due_date", "updated_at"].sort - # check_in - # check_out + 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 "index" do + it "responds with JSON and success" do + get rentals_path + + check_response(expected_type: Array) + end + + it "responds with an array of rentals hashes" do + get rentals_path + + body = check_response(expected_type: Array) + + body.each do |rental| + expect(rental).must_be_instance_of Hash + + expect(rental.keys.sort).must_equal REQUIRED_RENTALS_FIELDS + end + end + + it "will respond with an empty array when there are no rentals" do + Rental.destroy_all + + get rentals_path + + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + end + + describe "check out" do + let(:rental_data) { + { + video_id: videos(:video_1).id, + customer_id: customers(:customer_1).id + } + } + + it "will allow customer to check out a video" do + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 1 + + must_respond_with :success + end + + it "won't allow customer to checkout if video does not exist" do + rental_data[:video_id] = nil + + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 0 + + must_respond_with :not_found + end + + it "won't allow checkout if there is no customer" do + rental_data[:customer_id] = nil + + expect { + post check_out_path, params: rental_data + }.must_differ "Rental.count", 0 + must_respond_with :not_found + end + end end From b9b2a8d5d3b75498545ea4f10d5e00fb146669e3 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 17:29:42 -0700 Subject: [PATCH 39/60] updated rentals schema --- ...20200528212945_add_due_date_and_available_inventory.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 db/migrate/20200528212945_add_due_date_and_available_inventory.rb diff --git a/db/migrate/20200528212945_add_due_date_and_available_inventory.rb b/db/migrate/20200528212945_add_due_date_and_available_inventory.rb new file mode 100644 index 000000000..4168e7254 --- /dev/null +++ b/db/migrate/20200528212945_add_due_date_and_available_inventory.rb @@ -0,0 +1,8 @@ +class AddDueDateAndAvailableInventory < ActiveRecord::Migration[6.0] + def change + + add_column :rentals, :due_date, :datetime + add_column :rentals, :checked_in_date, :datetime + add_column :rentals, :checked_out_date, :datetime + end +end From 3d1f4e143da878e964aac45a06ba9b2a84f00052 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 17:30:01 -0700 Subject: [PATCH 40/60] updated schema --- db/schema.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 5697c8574..d4b2632a3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_05_28_040327) do +ActiveRecord::Schema.define(version: 2020_05_28_212945) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -33,6 +33,9 @@ t.datetime "updated_at", precision: 6, null: false t.bigint "video_id" t.bigint "customer_id" + t.datetime "due_date" + t.datetime "checked_in_date" + t.datetime "checked_out_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["video_id"], name: "index_rentals_on_video_id" end From 7e0a0f32ae03a7f7f5736a444f0b97f128c994ed Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 17:30:39 -0700 Subject: [PATCH 41/60] added check_in method, not fully working --- app/controllers/rentals_controller.rb | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a1453992a..c7dc64421 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,12 @@ class RentalsController < ApplicationController + def index + rentals = Rental.all + render json: rentals.as_json(), + status: :ok + + end + def check_out rental = Rental.new(rentals_params) @@ -11,21 +18,32 @@ def check_out return end + if video.nil? + render json: {errors: ["Not Found"] }, status: :not_found + return + end + if video.available_inventory > 0 rental.save video.available_inventory -= 1 video.save - - customer.checked_out_count += 1 + + customer.videos_checked_out_count += 1 customer.save end - return rental + render json: { + customer_id: customer.id, + video_id: video.id, + due_date: rental.due_date, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory + } + end - def check_in rentals = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id], check_in_date: nil) video = Video.find_by(id: params[:video_id]) From d903ceb6fb2b4702ce4221318e6874ec8226d101 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 17:31:07 -0700 Subject: [PATCH 42/60] minor edit --- app/controllers/videos_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index e6ee690c2..f145c10c8 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -11,7 +11,7 @@ def create video = Video.new(video_params) if video.save - render json: vidoe.as_json(only: [:id]), status: :created + render json: video.as_json(only: [:id]), status: :created return else render json: { From 32e57d8839735874ab6454e125e41d3a6dd46e65 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 17:32:10 -0700 Subject: [PATCH 43/60] exclude operating sytem file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8a1b1134b..bd7d16c3a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ # Ignore master key for decrypting credentials and more. /config/master.key +.DS_Store From ab90eae077188186d7217bbdb23c0f7fb813e642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Thu, 28 May 2020 17:33:53 -0700 Subject: [PATCH 44/60] added video_controller test --- app/controllers/videos_controller.rb | 15 +-------------- test/controllers/videos_controller_test.rb | 20 ++++++-------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 77fca2174..75eb89cac 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,17 +1,5 @@ class VideosController < ApplicationController -<<<<<<< HEAD - def index - videos = Video.all - render json: videos.as_json(only: [:id, :title, :overview, :release_date, :total_inventory, :available_inventory]), - status: :ok - end - - - def create - video = Video.new(video_params) - if video.save -======= def index videos = Video.order(:title).as_json(only: [:id, :title, :release_date, :available_inventory]) @@ -23,7 +11,6 @@ def create video = Video.new(video_params) if video.save ->>>>>>> f24073e9b19ae6662f3a713069d3451b34c1fea9 render json: vidoe.as_json(only: [:id]), status: :created return else @@ -40,7 +27,7 @@ def show video = Video.find_by(id: params[:id]) if video - render json: video.as_json(only: [ :title, :overview, :release_date, :total_inventory, :available_inventory]) + render json: vih:total_inventory, :available_inventory]) return else render json: {errors: ["Not Found"] }, status: :not_found diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 50b13aaac..350baf336 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -87,17 +87,14 @@ describe "create video" do let(:video_data){ { - video: { - title: "Petty woman", - overview: "about a girl's dream", - release_date: 1985 - # total_inventory: 7, - # available_inventory: 2 + title: "New video", + overview: "all about the new video", + release_date: DateTime.now, + total_inventory: 7, + available_inventory: 2 } } - } - it "create a video and given a valid data" do expect { @@ -127,11 +124,6 @@ expect(body["errors"]).must_include "title" must_respond_with :bad_request end - end - - it "can't create a video 0 in inventory" do - video_data[:video] [:available_inventory] = nil - end + end - end From ce93f9ba2e3e19350d3f3cd2322e7d15a50fdc1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Thu, 28 May 2020 17:59:12 -0700 Subject: [PATCH 45/60] updated and added more videos controller test --- app/controllers/videos_controller.rb | 7 ++++--- test/controllers/customers_controller_test.rb | 2 +- test/controllers/videos_controller_test.rb | 13 ++++++------- test/models/video_test.rb | 7 ++++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 031767f5f..904442eb9 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -27,19 +27,20 @@ def show video = Video.find_by(id: params[:id]) if video - render json: vih:total_inventory, :available_inventory]) + render json: video, only: [:id, :title, :release_date, :available_inventory] + return else render json: {errors: ["Not Found"] }, status: :not_found return + end end - private def video_params return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end -end + diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c19825f22..b438bc262 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - REQUIRED_CUSTOMER_FIELDS = ["id", "name", "address", "city", "state", "postal_code", "phone", "registered_at"].sort + REQUIRED_CUSTOMER_FIELDS = ["id", "name", "postal_code", "phone", "registered_at","videos_checked_out_count"].sort def check_response(expected_type:, expected_status: :success) must_respond_with expected_status diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 350baf336..fc2315150 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -2,7 +2,7 @@ describe VideosController do - VIDEO_FIELDS = ["id", "title", "overview", "release_date", "total_inventory", "available_inventory"].sort + VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort let(:video) {videos(:video_1)} describe "index" do @@ -92,20 +92,19 @@ release_date: DateTime.now, total_inventory: 7, available_inventory: 2 - } } - it "create a video and given a valid data" do + it "create a video when given a valid data" do expect { post videos_path, params: video_data }.must_change "Video.count",1 body = JSON.parse(response.body) expect(body).must_be_kind_of Hash - expect(body).must_include "title" + expect(body).must_include "id" - video = Video.find_by(title: body["title"]) + video = Video.find_by_id(body["id"]) must_respond_with :success end @@ -114,13 +113,13 @@ video_data["title"] = nil expect{ - post video_path, params: {vidoe: video_data} + post videos_path, params: {video: video_data} }.wont_change "Video.count" body = JSON.parse(response.body) expect(body).must_be_kind_of Hash - expect(body).must_include "error" + expect(body).must_include "errors" expect(body["errors"]).must_include "title" must_respond_with :bad_request end diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 5cd4e26b4..766d6b8bf 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -2,8 +2,9 @@ describe Video do -describe "relationship" do - it "has many rentals" do - + describe "relationship" do + it "has many rentals" do + + end end end From 9a888a5f52e0f22b04a182bb96c2e21f6c2fd221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Thu, 28 May 2020 19:26:42 -0700 Subject: [PATCH 46/60] wrote and passed video model test, passed --- test/models/video_test.rb | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 766d6b8bf..84c02d484 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,10 +1,37 @@ require "test_helper" + describe Video do + let(:video) { videos(:video_1) } + + it "must be valid" do + expect(video.valid?).must_equal true + end + + it "wont be valid without a title" do + video.title = "" + expect(video.valid?).must_equal false + end - describe "relationship" do - it "has many rentals" do - - end + + it "Shelley Rocha an associated customer" do + expect(video).must_respond_to :customers + expect(video.customers).must_include customers(:customer_1) end + + it "can have an associated rental" do + expect(video).must_respond_to :rentals + expect(video.rentals).must_include rentals(:rental_1) + end + end + + + + + + + + + + From da28df7c1702bcad5483d5e71f913a48a013cfeb Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:29:35 -0700 Subject: [PATCH 47/60] edited rental yml file --- test/fixtures/rentals.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 938b7b881..ac3da5f2c 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,8 +1,17 @@ rental_1: customer: customer_1 video: video_1 - + due_date: "2015-07-30T17:18:35.000Z" + checked_out_date: "2015-07-23T17:18:35.000Z" rental_2: customer: customer_2 video: video_2 + due_date: "2015-07-30T17:18:35.000Z" + checked_out_date: "2015-07-23T17:18:35.000Z" +rental_3: + customer: customer_1 + video: video_2 + due_date: "2015-07-30T17:18:35.000Z" + checked_out_date: "2015-07-23T17:18:35.000Z" + checked_in_date: "2015-07-30T17:18:35.000Z" From aedea20e8627bb72f5e333529f5b953ebe0c22ea Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:31:16 -0700 Subject: [PATCH 48/60] added helper methods to implement check-in and check-out --- app/controllers/rentals_controller.rb | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c7dc64421..cfb17d104 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,7 +9,7 @@ def index def check_out - rental = Rental.new(rentals_params) + rental = Rental.new(rentals_params.merge({checked_out_date: DateTime.now, due_date: DateTime.now + 7.days})) video = Video.find_by(id: rentals_params[:video_id]) customer = Customer.find_by(id: rentals_params[:customer_id]) @@ -23,15 +23,14 @@ def check_out return end + + if video.available_inventory > 0 rental.save - video.available_inventory -= 1 - video.save - - customer.videos_checked_out_count += 1 - customer.save - end + video.decrease_inventory + customer.add_checked_out + end render json: { customer_id: customer.id, @@ -45,17 +44,17 @@ def check_out def check_in - rentals = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id], check_in_date: nil) + rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id], checked_in_date: nil) video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) if rental.nil? - render json: {errors: ["Rental not Found"] }, status: :bad_request + render json: {errors: ["Not Found"] }, status: :not_found return end - rental.check_in_date = Date.today # check if this is neccessary + rental.checked_in_date = DateTime.now if rental.save video.increase_inventory @@ -68,13 +67,6 @@ def check_in render json: { ok: false, errors: rental.errors.messages }, status: :bad_request return end - - - # customer.checked_in_count -= 1 - # movie.available_inventory += 1 - - # customer.save - # video.save end From 586072de9d7cb2e8f31ab62f587d8a399d755e60 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:31:37 -0700 Subject: [PATCH 49/60] added helper methods --- app/models/customer.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 5db327840..d1903fc01 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -11,4 +11,14 @@ class Customer < ApplicationRecord validates :phone, presence: true validates :registered_at, presence: true + def add_checked_out + self.videos_checked_out_count += 1 + save + end + + def remove_checked_out + self.videos_checked_out_count -= 1 + save + + end end From 3bd8e79dd34122d23536b9237c17680f7e4e6e32 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:31:53 -0700 Subject: [PATCH 50/60] added validations for rental --- app/models/rental.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index e59b086a5..920f2b201 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,4 +2,9 @@ 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 :checked_out_date, presence: true + end From 2aa2bcb139a25e0ff47c1dd67523fed585614b22 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:32:17 -0700 Subject: [PATCH 51/60] added helper method --- app/models/video.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/models/video.rb b/app/models/video.rb index 3cdfa9a71..f4439ba7a 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -9,6 +9,22 @@ class Video < ApplicationRecord validates :total_inventory, presence: true validates :available_inventory, presence: true + + def decrease_inventory + self.available_inventory -= 1 + save + + end + + + def increase_inventory + self.available_inventory += 1 + save + + end + + + end From 725f9e2cd046d11430f4ee6c68bd541f2ba94358 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:33:22 -0700 Subject: [PATCH 52/60] added check-in test --- test/controllers/rentals_controller_test.rb | 43 ++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a9eba7fbd..4a9a56f6a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -describe RentalsController do # "check_in_date" "check_out_date", +describe RentalsController do REQUIRED_RENTALS_FIELDS = ["id", "customer_id", "video_id", "checked_in_date", "checked_out_date", "created_at", "due_date", "updated_at"].sort def check_response(expected_type:, expected_status: :success) @@ -76,4 +76,45 @@ def check_response(expected_type:, expected_status: :success) must_respond_with :not_found end end + + + describe "check in" do + let(:rental_data) { + { + video_id: videos(:video_1).id, + customer_id: customers(:customer_1).id + } + } + + it "will allow customer to check_in a video" do + post check_in_path, params: rental_data + must_respond_with :success + post check_in_path, params: rental_data + must_respond_with :not_found + end + + it "won't allow customer to check_in a video that has already been checked-in" do + post check_in_path, params: { + video_id: videos(:video_2).id, + customer_id: customers(:customer_1).id + } + must_respond_with :not_found + end + + + + it "won't allow customer to check_in if video does not exist" do + rental_data[:video_id] = nil + post check_in_path, params: rental_data + must_respond_with :not_found + end + + it "won't allow check_in if there is no customer" do + rental_data[:customer_id] = nil + post check_in_path, params: rental_data + must_respond_with :not_found + end + + end + end From 92451cb2e222a74e33e04f7715fe546765c1a472 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:33:55 -0700 Subject: [PATCH 53/60] added validation tests for rental --- test/models/rental_test.rb | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..f9a9f1f45 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,24 @@ require "test_helper" -describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe Rental do + describe "validation" do + let(:rental) { rentals(:rental_1) } + + it "must be valid" do + expect(rental.valid?).must_equal true + + end + it "wont be valid without a title" do + required_fields = [:customer_id, :video_id, :due_date, :checked_out_date] + + rental = Rental.new + expect(rental.valid?).must_equal false + expect(rental.errors[:checked_in_date].count.zero?).must_equal true + + required_fields.each do |field| + expect(rental.errors[field].count.positive?).must_equal true + end + + end + end end From d31a788e96b5dd42f5103170a50d34e7e01d1411 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:54:12 -0700 Subject: [PATCH 54/60] made test specific required fields --- test/controllers/videos_controller_test.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index fc2315150..ad4f72f3f 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,8 +1,9 @@ require "test_helper" describe VideosController do - - VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort + #:title, :overview, :release_date, :total_inventory, :available_inventory + INDEX_FIELDS = %w[id title release_date available_inventory].sort + SHOW_FIELDS = %w[title release_date available_inventory overview total_inventory].sort let(:video) {videos(:video_1)} describe "index" do @@ -29,7 +30,7 @@ body = JSON.parse(response.body) body.each do |video| expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal VIDEO_FIELDS + expect(video.keys.sort).must_equal INDEX_FIELDS end end @@ -70,7 +71,7 @@ expect(response.header["Content-Type"]).must_include "json" expect(body).must_be_instance_of Hash - expect(body.keys.sort).must_equal VIDEO_FIELDS + expect(body.keys.sort).must_equal SHOW_FIELDS end it "will give error for inexistent video" do From 2a8729d9e8bf06f8b2ff6baaa9afb3734c7618db Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:54:41 -0700 Subject: [PATCH 55/60] deleted un needed show action --- app/controllers/customers_controller.rb | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 4afe8c335..d08230c3d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,22 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.order(:name).as_json(only: [:id, :name, :postal_code, :phone, :registered_at, :videos_checked_out_count]) - render json: customers, status: :ok - + render json: customers, status: :ok end - - - def show - customer = Customer.find_by(id: params[:id]) - - if customer - render json: customer.as_json(only: [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at]) - return - else - render json: { ok: false, errors: ["Not Found"] }, status: :not_found - return - end - - end - + end From 52b08295e8c470ee8f472441c7949dd4099a2317 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:55:00 -0700 Subject: [PATCH 56/60] fixed fields for smoke tests --- app/controllers/videos_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 904442eb9..812128fab 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -27,7 +27,7 @@ def show video = Video.find_by(id: params[:id]) if video - render json: video, only: [:id, :title, :release_date, :available_inventory] + render json: video, only: [:title, :overview, :release_date, :total_inventory, :available_inventory] return else From 85a2f3538164d3e82487ac08558943714530bd90 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 19:55:30 -0700 Subject: [PATCH 57/60] defaulted checked_out_count to 0 --- db/seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 2ea255387..b9c7addf4 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,5 @@ JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - customer['videos_checked_out_count'] = 1 + customer['videos_checked_out_count'] = 0 Customer.create!(customer) end From 4d97222f652f63035ed2afb751ed60039b07d18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Thu, 28 May 2020 20:02:34 -0700 Subject: [PATCH 58/60] fixed indentations & all waves /postman test passing --- Gemfile | 36 ++++++------ Rakefile | 2 +- app/controllers/customers_controller.rb | 9 +-- app/controllers/rentals_controller.rb | 47 ++++++---------- app/controllers/videos_controller.rb | 26 ++++----- app/mailers/application_mailer.rb | 4 +- app/models/customer.rb | 6 +- app/models/rental.rb | 1 - app/models/video.rb | 10 ---- config.ru | 2 +- config/application.rb | 10 ++-- config/boot.rb | 6 +- config/environment.rb | 2 +- config/environments/development.rb | 5 +- config/environments/production.rb | 10 ++-- config/environments/test.rb | 4 +- config/puma.rb | 2 +- config/routes.rb | 1 - db/migrate/20200527210447_create_rentals.rb | 1 - ...45_add_due_date_and_available_inventory.rb | 5 +- db/schema.rb | 1 - db/seeds.rb | 8 +-- test/controllers/customers_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 55 +++++++++---------- test/controllers/videos_controller_test.rb | 21 +++---- test/models/customer_test.rb | 19 +++---- test/models/rental_test.rb | 12 ++-- test/models/video_test.rb | 13 ----- test/test_helper.rb | 6 +- 29 files changed, 129 insertions(+), 197 deletions(-) diff --git a/Gemfile b/Gemfile index b585a3d2b..519559a33 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,14 @@ -source 'https://rubygems.org' +source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.6.5' +ruby "2.6.5" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +gem "rails", "~> 6.0.3", ">= 6.0.3.1" # Use postgresql as the database for Active Record -gem 'pg', '>= 0.18', '< 2.0' +gem "pg", ">= 0.18", "< 2.0" # Use Puma as the app server -gem 'puma', '~> 4.1' +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 @@ -20,38 +20,38 @@ gem 'puma', '~> 4.1' # gem 'image_processing', '~> 1.2' # Reduces boot times through caching; required in config/boot.rb -gem 'bootsnap', '>= 1.4.2', require: false +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] + gem "byebug", platforms: [:mri, :mingw, :x64_mingw] end group :development do - gem 'listen', '~> 3.2' + 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' + 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] +gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] group :development, :test do - gem 'pry-rails' + 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' + 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' + gem "minitest-rails" + gem "minitest-reporters" end diff --git a/Rakefile b/Rakefile index e85f91391..9a5ea7383 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +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' +require_relative "config/application" Rails.application.load_tasks diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 4afe8c335..c78470ad7 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,12 +1,9 @@ class CustomersController < ApplicationController - - def index + def index customers = Customer.order(:name).as_json(only: [:id, :name, :postal_code, :phone, :registered_at, :videos_checked_out_count]) - render json: customers, status: :ok - + render json: customers, status: :ok end - def show customer = Customer.find_by(id: params[:id]) @@ -17,7 +14,5 @@ def show render json: { ok: false, errors: ["Not Found"] }, status: :not_found return end - end - end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cfb17d104..70d94e2d3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,30 +1,25 @@ class RentalsController < ApplicationController - def index rentals = Rental.all render json: rentals.as_json(), - status: :ok - + status: :ok end - - def check_out - rental = Rental.new(rentals_params.merge({checked_out_date: DateTime.now, due_date: DateTime.now + 7.days})) + def check_out + rental = Rental.new(rentals_params.merge({ checked_out_date: DateTime.now, due_date: DateTime.now + 7.days })) video = Video.find_by(id: rentals_params[:video_id]) customer = Customer.find_by(id: rentals_params[:customer_id]) if customer.nil? - render json: {errors: ["Not Found"] }, status: :not_found + render json: { errors: ["Not Found"] }, status: :not_found return end if video.nil? - render json: {errors: ["Not Found"] }, status: :not_found + render json: { errors: ["Not Found"] }, status: :not_found return end - - if video.available_inventory > 0 rental.save @@ -32,47 +27,41 @@ def check_out customer.add_checked_out end - render json: { - customer_id: customer.id, - video_id: video.id, - due_date: rental.due_date, - videos_checked_out_count: customer.videos_checked_out_count, - available_inventory: video.available_inventory - } - -end - + render json: { + customer_id: customer.id, + video_id: video.id, + due_date: rental.due_date, + videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory, + } + end def check_in rental = Rental.find_by(customer_id: params[:customer_id], video_id: params[:video_id], checked_in_date: nil) video = Video.find_by(id: params[:video_id]) customer = Customer.find_by(id: params[:customer_id]) - if rental.nil? - render json: {errors: ["Not Found"] }, status: :not_found + render json: { errors: ["Not Found"] }, status: :not_found return end rental.checked_in_date = DateTime.now - + if rental.save video.increase_inventory customer.remove_checked_out - render json: {customer_id: rental.customer_id, - video_id: rental.video_id, videos_checked_out_count: customer.videos_checked_out_count, - available_inventory: video.available_inventory}, status: :ok + render json: { customer_id: rental.customer_id, + video_id: rental.video_id, videos_checked_out_count: customer.videos_checked_out_count, + available_inventory: video.available_inventory }, status: :ok return else render json: { ok: false, errors: rental.errors.messages }, status: :bad_request return end - end def rentals_params return params.permit(:customer_id, :video_id) end end - - diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 904442eb9..643d3da62 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,46 +1,40 @@ class VideosController < ApplicationController - - def index - + def index videos = Video.order(:title).as_json(only: [:id, :title, :release_date, :available_inventory]) render json: videos, status: :ok - end def create video = Video.new(video_params) - if video.save + if video.save render json: video.as_json(only: [:id]), status: :created return else render json: { - - errors: video.errors.messages - }, status: :bad_request + + errors: video.errors.messages, + }, status: :bad_request return end end - - + def show video = Video.find_by(id: params[:id]) - if video + if video render json: video, only: [:id, :title, :release_date, :available_inventory] - + return else - render json: {errors: ["Not Found"] }, status: :not_found + render json: { errors: ["Not Found"] }, status: :not_found return end end - private def video_params return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end -end - +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 286b2239d..3c34c8148 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,4 +1,4 @@ class ApplicationMailer < ActionMailer::Base - default from: 'from@example.com' - layout 'mailer' + default from: "from@example.com" + layout "mailer" end diff --git a/app/models/customer.rb b/app/models/customer.rb index d1903fc01..d0c0f6144 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,4 @@ class Customer < ApplicationRecord - has_many :rentals has_many :videos, through: :rentals @@ -11,14 +10,13 @@ class Customer < ApplicationRecord validates :phone, presence: true validates :registered_at, presence: true - def add_checked_out + def add_checked_out self.videos_checked_out_count += 1 save end - def remove_checked_out + def remove_checked_out self.videos_checked_out_count -= 1 save - end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 920f2b201..1b2a2789f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -6,5 +6,4 @@ class Rental < ApplicationRecord validates :video_id, presence: true validates :due_date, presence: true validates :checked_out_date, presence: true - end diff --git a/app/models/video.rb b/app/models/video.rb index f4439ba7a..e08b5a24a 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,5 +1,4 @@ class Video < ApplicationRecord - has_many :rentals has_many :customers, through: :rentals @@ -8,23 +7,14 @@ class Video < ApplicationRecord validates :release_date, presence: true validates :total_inventory, presence: true validates :available_inventory, presence: true - def decrease_inventory self.available_inventory -= 1 save - end - def increase_inventory self.available_inventory += 1 save - end - - - end - - diff --git a/config.ru b/config.ru index f7ba0b527..441e6ff0c 100644 --- a/config.ru +++ b/config.ru @@ -1,5 +1,5 @@ # This file is used by Rack-based servers to start the application. -require_relative 'config/environment' +require_relative "config/environment" run Rails.application diff --git a/config/application.rb b/config/application.rb index 43301a817..e02e58d98 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,4 +1,4 @@ -require_relative 'boot' +require_relative "boot" require "rails" # Pick the frameworks you want: @@ -21,10 +21,10 @@ 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 + 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 diff --git a/config/boot.rb b/config/boot.rb index b9e460cef..988a5ddc4 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,4 +1,4 @@ -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +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. +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/environment.rb b/config/environment.rb index 426333bb4..cac531577 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,5 +1,5 @@ # Load the Rails application. -require_relative 'application' +require_relative "application" # Initialize the Rails application. Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb index 698f159d8..1f1011983 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -14,10 +14,10 @@ # Enable/disable caching. By default caching is disabled. # Run rails dev:cache to toggle caching. - if Rails.root.join('tmp', 'caching-dev.txt').exist? + 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}" + "Cache-Control" => "public, max-age=#{2.days.to_i}", } else config.action_controller.perform_caching = false @@ -42,7 +42,6 @@ # 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 diff --git a/config/environments/production.rb b/config/environments/production.rb index 7a3bb3e50..353b92406 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -11,7 +11,7 @@ config.eager_load = true # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false + 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). @@ -19,7 +19,7 @@ # 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? + 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' @@ -44,7 +44,7 @@ config.log_level = :debug # Prepend all log lines with the following tags. - config.log_tags = [ :request_id ] + config.log_tags = [:request_id] # Use a different cache store in production. # config.cache_store = :mem_cache_store @@ -74,9 +74,9 @@ # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') if ENV["RAILS_LOG_TO_STDOUT"].present? - logger = ActiveSupport::Logger.new(STDOUT) + logger = ActiveSupport::Logger.new(STDOUT) logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) + config.logger = ActiveSupport::TaggedLogging.new(logger) end # Do not dump schema after migrations. diff --git a/config/environments/test.rb b/config/environments/test.rb index 0cb24249b..afcfa01ca 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -17,11 +17,11 @@ # 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}" + "Cache-Control" => "public, max-age=#{1.hour.to_i}", } # Show full error reports and disable caching. - config.consider_all_requests_local = true + config.consider_all_requests_local = true config.action_controller.perform_caching = false config.cache_store = :null_store diff --git a/config/puma.rb b/config/puma.rb index 5ed443774..2d3d96983 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -10,7 +10,7 @@ # Specifies the `port` that Puma will listen on to receive requests; default is 3000. # -port ENV.fetch("PORT") { 3000 } +port ENV.fetch("PORT") { 3000 } # Specifies the `environment` that Puma will run in. # diff --git a/config/routes.rb b/config/routes.rb index 662bd3ba9..db3ef6bf0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,4 @@ Rails.application.routes.draw do - resources :rentals resources :customers, only: [:index, :create, :show] resources :videos, only: [:index, :create, :show] diff --git a/db/migrate/20200527210447_create_rentals.rb b/db/migrate/20200527210447_create_rentals.rb index 85f45ae24..e3d9d58a4 100644 --- a/db/migrate/20200527210447_create_rentals.rb +++ b/db/migrate/20200527210447_create_rentals.rb @@ -1,7 +1,6 @@ class CreateRentals < ActiveRecord::Migration[6.0] def change create_table :rentals do |t| - t.timestamps end end diff --git a/db/migrate/20200528212945_add_due_date_and_available_inventory.rb b/db/migrate/20200528212945_add_due_date_and_available_inventory.rb index 4168e7254..df473814d 100644 --- a/db/migrate/20200528212945_add_due_date_and_available_inventory.rb +++ b/db/migrate/20200528212945_add_due_date_and_available_inventory.rb @@ -1,8 +1,7 @@ class AddDueDateAndAvailableInventory < ActiveRecord::Migration[6.0] def change - - add_column :rentals, :due_date, :datetime + add_column :rentals, :due_date, :datetime add_column :rentals, :checked_in_date, :datetime add_column :rentals, :checked_out_date, :datetime - end + end end diff --git a/db/schema.rb b/db/schema.rb index d4b2632a3..2c3f191b0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -49,5 +49,4 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false end - end diff --git a/db/seeds.rb b/db/seeds.rb index 2ea255387..2d51c0b19 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,12 +1,12 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - customer['videos_checked_out_count'] = 1 +JSON.parse(File.read("db/seeds/customers.json")).each do |customer| + customer["videos_checked_out_count"] = 1 Customer.create!(customer) end puts "The database now has #{Customer.count} customers" -JSON.parse(File.read('db/seeds/videos.json')).each do |video| +JSON.parse(File.read("db/seeds/videos.json")).each do |video| Video.create!(video) end -puts "The database now has #{Video.count} videos" \ No newline at end of file +puts "The database now has #{Video.count} videos" diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b438bc262..d1cf149d5 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - REQUIRED_CUSTOMER_FIELDS = ["id", "name", "postal_code", "phone", "registered_at","videos_checked_out_count"].sort + REQUIRED_CUSTOMER_FIELDS = ["id", "name", "postal_code", "phone", "registered_at", "videos_checked_out_count"].sort def check_response(expected_type:, expected_status: :success) must_respond_with expected_status diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4a9a56f6a..a12faae70 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,18 +1,18 @@ require "test_helper" -describe RentalsController do +describe RentalsController do REQUIRED_RENTALS_FIELDS = ["id", "customer_id", "video_id", "checked_in_date", "checked_out_date", "created_at", "due_date", "updated_at"].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 "index" do + describe "index" do it "responds with JSON and success" do get rentals_path @@ -41,35 +41,35 @@ def check_response(expected_type:, expected_status: :success) end end - describe "check out" do + describe "check out" do let(:rental_data) { - { - video_id: videos(:video_1).id, - customer_id: customers(:customer_1).id - } + { + video_id: videos(:video_1).id, + customer_id: customers(:customer_1).id, + } } - + it "will allow customer to check out a video" do expect { - post check_out_path, params: rental_data + post check_out_path, params: rental_data }.must_differ "Rental.count", 1 - + must_respond_with :success end it "won't allow customer to checkout if video does not exist" do rental_data[:video_id] = nil - + expect { - post check_out_path, params: rental_data + post check_out_path, params: rental_data }.must_differ "Rental.count", 0 - + must_respond_with :not_found end it "won't allow checkout if there is no customer" do rental_data[:customer_id] = nil - + expect { post check_out_path, params: rental_data }.must_differ "Rental.count", 0 @@ -77,15 +77,14 @@ def check_response(expected_type:, expected_status: :success) end end - - describe "check in" do + describe "check in" do let(:rental_data) { - { - video_id: videos(:video_1).id, - customer_id: customers(:customer_1).id + { + video_id: videos(:video_1).id, + customer_id: customers(:customer_1).id, + } } - } - + it "will allow customer to check_in a video" do post check_in_path, params: rental_data must_respond_with :success @@ -94,14 +93,12 @@ def check_response(expected_type:, expected_status: :success) end it "won't allow customer to check_in a video that has already been checked-in" do - post check_in_path, params: { - video_id: videos(:video_2).id, - customer_id: customers(:customer_1).id - } + post check_in_path, params: { + video_id: videos(:video_2).id, + customer_id: customers(:customer_1).id, + } must_respond_with :not_found end - - it "won't allow customer to check_in if video does not exist" do rental_data[:video_id] = nil @@ -114,7 +111,5 @@ def check_response(expected_type:, expected_status: :success) post check_in_path, params: rental_data must_respond_with :not_found end - end - end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index fc2315150..e8a88caf8 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,9 +1,8 @@ require "test_helper" describe VideosController do - VIDEO_FIELDS = ["id", "title", "release_date", "available_inventory"].sort - let(:video) {videos(:video_1)} + let(:video) { videos(:video_1) } describe "index" do it "list all the videos" do @@ -67,7 +66,7 @@ body = JSON.parse(response.body) - expect(response.header["Content-Type"]).must_include "json" + expect(response.header["Content-Type"]).must_include "json" expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal VIDEO_FIELDS @@ -85,20 +84,20 @@ end describe "create video" do - let(:video_data){ + let(:video_data) { { title: "New video", overview: "all about the new video", release_date: DateTime.now, total_inventory: 7, - available_inventory: 2 - } + available_inventory: 2, } + } it "create a video when given a valid data" do expect { post videos_path, params: video_data - }.must_change "Video.count",1 + }.must_change "Video.count", 1 body = JSON.parse(response.body) expect(body).must_be_kind_of Hash @@ -109,11 +108,10 @@ end it "return an error for invalid video data" do - video_data["title"] = nil - expect{ - post videos_path, params: {video: video_data} + expect { + post videos_path, params: { video: video_data } }.wont_change "Video.count" body = JSON.parse(response.body) @@ -123,6 +121,5 @@ expect(body["errors"]).must_include "title" must_respond_with :bad_request end - end - + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index d1ff86218..289d47e35 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,20 +1,17 @@ require "test_helper" describe Customer do + let (:shelley) { customers(:customer_1) } - let (:shelley) {customers(:customer_1)} - - describe "Validation" do - + describe "Validation" do it "requires name, address, city, state, postal_code, phone, registered_at" do - required_fields = [:name, :address, :city, :state, :postal_code, :phone, :registered_at] - + required_fields.each do |field| shelley[field] = nil - + expect(shelley.valid?).must_equal false - + shelley.reload end end @@ -22,13 +19,11 @@ describe "Relationship" do it "has rental" do - - shelley.must_respond_to :rentals + shelley.must_respond_to :rentals end it "customer has video " do shelley.must_respond_to :videos end - end - + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index f9a9f1f45..4bcfd8b01 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,12 +1,11 @@ require "test_helper" - describe Rental do - describe "validation" do +describe Rental do + describe "validation" do let(:rental) { rentals(:rental_1) } it "must be valid" do expect(rental.valid?).must_equal true - end it "wont be valid without a title" do required_fields = [:customer_id, :video_id, :due_date, :checked_out_date] @@ -14,11 +13,10 @@ rental = Rental.new expect(rental.valid?).must_equal false expect(rental.errors[:checked_in_date].count.zero?).must_equal true - + required_fields.each do |field| - expect(rental.errors[field].count.positive?).must_equal true + expect(rental.errors[field].count.positive?).must_equal true end - end - end + end end diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 84c02d484..d2e520ab9 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,6 +1,5 @@ require "test_helper" - describe Video do let(:video) { videos(:video_1) } @@ -13,7 +12,6 @@ expect(video.valid?).must_equal false end - it "Shelley Rocha an associated customer" do expect(video).must_respond_to :customers expect(video.customers).must_include customers(:customer_1) @@ -23,15 +21,4 @@ expect(video).must_respond_to :rentals expect(video.rentals).must_include rentals(:rental_1) end - end - - - - - - - - - - diff --git a/test/test_helper.rb b/test/test_helper.rb index b19af0d5b..cd948a5b1 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,6 @@ -ENV['RAILS_ENV'] ||= 'test' -require_relative '../config/environment' -require 'rails/test_help' +ENV["RAILS_ENV"] ||= "test" +require_relative "../config/environment" +require "rails/test_help" require "minitest/rails" require "minitest/reporters" # for Colorized output # For colorful output! From a4bd9674f2cb56b79b23901c173357a7a9342596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Teki=C3=A9?= Date: Thu, 28 May 2020 20:07:52 -0700 Subject: [PATCH 59/60] fixed indentations --- app/controllers/customers_controller.rb | 3 +-- app/controllers/videos_controller.rb | 4 ++-- db/seeds.rb | 4 ++-- test/controllers/videos_controller_test.rb | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index fe81136e4..254841d30 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,6 @@ class CustomersController < ApplicationController def index customers = Customer.order(:name).as_json(only: [:id, :name, :postal_code, :phone, :registered_at, :videos_checked_out_count]) - render json: customers, status: :ok + render json: customers, status: :ok end - end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 8c6a384f6..3a1c0f146 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -22,9 +22,9 @@ def create def show video = Video.find_by(id: params[:id]) - if video + if video render json: video, only: [:title, :overview, :release_date, :total_inventory, :available_inventory] - + return else render json: { errors: ["Not Found"] }, status: :not_found diff --git a/db/seeds.rb b/db/seeds.rb index eee8fc404..216f4fd55 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,5 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - customer['videos_checked_out_count'] = 0 +JSON.parse(File.read("db/seeds/customers.json")).each do |customer| + customer["videos_checked_out_count"] = 0 Customer.create!(customer) end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 4c4234e6e..92426a3d2 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,10 +1,10 @@ require "test_helper" describe VideosController do - #:title, :overview, :release_date, :total_inventory, :available_inventory + #:title, :overview, :release_date, :total_inventory, :available_inventory INDEX_FIELDS = %w[id title release_date available_inventory].sort - SHOW_FIELDS = %w[title release_date available_inventory overview total_inventory].sort - let(:video) {videos(:video_1)} + SHOW_FIELDS = %w[title release_date available_inventory overview total_inventory].sort + let(:video) { videos(:video_1) } describe "index" do it "list all the videos" do From 36e7e418addb0a63a614b9de3135bf03683f7831 Mon Sep 17 00:00:00 2001 From: Haben Date: Thu, 28 May 2020 21:03:21 -0700 Subject: [PATCH 60/60] minor edit --- test/models/rental_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 4bcfd8b01..9ecc3fd7e 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -7,7 +7,7 @@ it "must be valid" do expect(rental.valid?).must_equal true end - it "wont be valid without a title" do + it "wont be valid without all the neccessary fields" do required_fields = [:customer_id, :video_id, :due_date, :checked_out_date] rental = Rental.new