From 16c7b3e7fd642854ee5ef588aa70f2c1b58c5f99 Mon Sep 17 00:00:00 2001 From: Hallie Date: Tue, 5 Nov 2019 11:58:14 -0800 Subject: [PATCH 01/23] Initial commit --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 59 ++++++ Gemfile.lock | 175 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 ++++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 10 + tmp/.keep | 0 vendor/.keep | 0 58 files changed, 932 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..160fe391c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.5 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..8143da43e --- /dev/null +++ b/Gemfile @@ -0,0 +1,59 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :development do + 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..981f08e8a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.5) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.5) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.6) + erubi (1.9.0) + ffi (1.11.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.7.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.3.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.13.0) + minitest-rails (5.2.0) + minitest (~> 5.10) + railties (~> 5.2.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.1) + nio4r (2.5.2) + nokogiri (1.10.5) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (13.0.0) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-debug-ide (0.7.0) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + ruby_dep (1.5.0) + 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 (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + debase (>= 0.2.4.1) + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.5p157 + +BUNDLED WITH + 2.0.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..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/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..56f84c20c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreApi + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..6cc616cd1 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video-store-api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..4e8bf8986 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +1PY2RWZtNpyObG9sqvUolQr81p7xvXYBhty1CehOl3kt0NhfJAuL+ww4Yyguxt0J5TKxalUzcwqdjrnGTN2nzXc5Ppfz9owkmJWkhEEVgpcgjx2cjSFMWaFMZrTKYP/s31iJLMKD+/OCRUZybvXSdXO0QZIMnZbU83cLz93q+JqpwBPqK/qZZDBlTJx7ta6jTOnf8z29Qndl6zfQYQzuORBnP9QCHJBCDCTVPAjwFV/xVjh474rXG7RX46YzY/YBewPAoyP4ReDXDqgWz+6nuV7esxxtbbYxh+k/oe+4ER0B6+FbUnbO5BylH4GpQBnUseN9OrtrDEFcpUydwv0PK+qRPT3ce9pBQS8rZz2tDa5vnlwLtLeKmsgGdvUArZATOXaH+Y3OCBphrgt33HyNTPZnBi1prPgoKLxk--WP8pLj3tozwPa4Mj--qv16oEkL9DTy5yT4GF/erA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..25f76c8e1 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: 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/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: 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..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f023a796 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "video-store-api_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..3ab84e3d1 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 06f597f5472664c4d221a48fe68a6e6b1778195f Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Tue, 5 Nov 2019 13:59:04 -0800 Subject: [PATCH 02/23] Added models and controllers --- app/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 2 + app/controllers/rentals_controller.rb | 2 + app/models/customer.rb | 3 ++ app/models/movie.rb | 3 ++ app/models/rental.rb | 4 ++ config/routes.rb | 1 + db/migrate/20191105214422_create_customers.rb | 14 ++++++ db/migrate/20191105214427_create_movies.rb | 11 +++++ db/migrate/20191105214431_create_rentals.rb | 10 ++++ ...5215351_change_column_spelling_customer.rb | 5 ++ db/schema.rb | 47 +++++++++++++++++++ test/controllers/customers_controller_test.rb | 7 +++ test/controllers/movies_controller_test.rb | 7 +++ test/controllers/rentals_controller_test.rb | 7 +++ test/models/customer_test.rb | 7 +++ test/models/movie_test.rb | 7 +++ test/models/rental_test.rb | 7 +++ 18 files changed, 146 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20191105214422_create_customers.rb create mode 100644 db/migrate/20191105214427_create_movies.rb create mode 100644 db/migrate/20191105214431_create_rentals.rb create mode 100644 db/migrate/20191105215351_change_column_spelling_customer.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..d2533dbf9 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + has_many :rentals +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..b8b339cbc --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,3 @@ +class Movie < ApplicationRecord + has_many :rentals +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..34d3f4df8 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..b53201270 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + end diff --git a/db/migrate/20191105214422_create_customers.rb b/db/migrate/20191105214422_create_customers.rb new file mode 100644 index 000000000..b3fb68652 --- /dev/null +++ b/db/migrate/20191105214422_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registred_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + t.timestamps + end + end +end diff --git a/db/migrate/20191105214427_create_movies.rb b/db/migrate/20191105214427_create_movies.rb new file mode 100644 index 000000000..762422c77 --- /dev/null +++ b/db/migrate/20191105214427_create_movies.rb @@ -0,0 +1,11 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + t.timestamps + end + end +end diff --git a/db/migrate/20191105214431_create_rentals.rb b/db/migrate/20191105214431_create_rentals.rb new file mode 100644 index 000000000..6b8a5573c --- /dev/null +++ b/db/migrate/20191105214431_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.datetime :checkout_date + t.datetime :due_date + t.datetime :checkin_date + t.timestamps + end + end +end diff --git a/db/migrate/20191105215351_change_column_spelling_customer.rb b/db/migrate/20191105215351_change_column_spelling_customer.rb new file mode 100644 index 000000000..c9b949a92 --- /dev/null +++ b/db/migrate/20191105215351_change_column_spelling_customer.rb @@ -0,0 +1,5 @@ +class ChangeColumnSpellingCustomer < ActiveRecord::Migration[5.2] + def change + rename_column(:customers, :registred_at, :registered_at) + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..5a6a2798e --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,47 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_11_05_215351) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.datetime "checkout_date" + t.datetime "due_date" + t.datetime "checkin_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..b11d50cea --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/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/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..cd59ab14a --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Movie 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 4cc9ae65a4924485abeaf0a5726469a8ce71515f Mon Sep 17 00:00:00 2001 From: Hallie Date: Tue, 5 Nov 2019 14:29:25 -0800 Subject: [PATCH 03/23] getting ready for model tests. --- test/fixtures/customers.yml | 17 +++++++++++++++++ test/fixtures/movies.yml | 17 +++++++++++++++++ test/models/customer_test.rb | 22 +++++++++++++++++++--- 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..060524c46 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,17 @@ +shelley: + name: Shelley Rocha + registered_at: Wed 29 Apr 2015 07:54:14 -0700 + address: Ap #292-5216 Ipsum Rd. + city: Hillsboro + state: OR + postal_code: 24309 + phone: (322) 510-8695 + +curran: + name: Curran Stout + registered_at: Wed 16 Apr 2014 21:40:20 -0700 + address: Ap #658-1540 Erat Rd. + city: San Francisco + state: California + postal_code: 94267 + phone: (908) 949-6758 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..89f2e14ab --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,17 @@ +blacksmith: + title: Blacksmith Of The Banished + overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life. + release_date: 1979-01-18 + inventory: 10 + +savior: + title: Savior Of The Curse + overview: The strange woman claims the boy has a DNA strain which very likely offers the key to cure several crippling diseases. Tests will have to be done but the key to save millions of lives is within the grasp of science through this DNA strain. Unsure what to think of all this and of this strange woman the boy hesitantly agrees to the proposal there's something exciting about this whole situation surely the right choice was made. + release_date: 2010-11-05 + inventory: 1 + +women: + title: Women Of Destruction + overview: But what if this strange woman is a con artist. Or what if everything told is completely true. How could an ordinary boy be relied upon in something this big. Time will tell. + release_date: 2006-10-01 + inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..9431f3a37 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,23 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "relations" do + let(:customer) { customers(:shelley) } + let(:rental_1) {movies()} + let(:rental_2) {movies()} + + it "can have many rentals" do + customer.rental << + end + + it "can have zero rentals" do + end + end + + describe "validations" do + it "is valid when all fields are present" do + end + + it + end end From cef8b7104514c758b51d3bb6d26e6150665c85ad Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Tue, 5 Nov 2019 14:36:19 -0800 Subject: [PATCH 04/23] Added rental reference migration --- db/migrate/20191105223122_add_rental_references.rb | 6 ++++++ db/schema.rb | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20191105223122_add_rental_references.rb diff --git a/db/migrate/20191105223122_add_rental_references.rb b/db/migrate/20191105223122_add_rental_references.rb new file mode 100644 index 000000000..7c5325ac1 --- /dev/null +++ b/db/migrate/20191105223122_add_rental_references.rb @@ -0,0 +1,6 @@ +class AddRentalReferences < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 5a6a2798e..7023d61be 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_05_215351) do +ActiveRecord::Schema.define(version: 2019_11_05_223122) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,6 +42,12 @@ t.datetime "checkin_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From 3abb269a6100bdc24c237ad30c8c9ffcad3e93e8 Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Tue, 5 Nov 2019 15:27:43 -0800 Subject: [PATCH 05/23] Customer model tests added --- app/models/customer.rb | 8 ++++++ test/models/customer_test.rb | 54 +++++++++++++++++++++++++++++++++--- test/test_helper.rb | 9 +++++- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..de70f31e5 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,11 @@ class Customer < ApplicationRecord has_many :rentals + + 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 + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 9431f3a37..3a4913465 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -3,21 +3,67 @@ describe Customer do describe "relations" do let(:customer) { customers(:shelley) } - let(:rental_1) {movies()} - let(:rental_2) {movies()} + let(:movie) {movies(:blacksmith)} + let(:movie2) {movies(:savior)} it "can have many rentals" do - customer.rental << + Rental.create(movie_id: movie.id, customer_id: customer.id) + Rental.create(movie_id: movie2.id, customer_id: customer.id) + + expect(customer.rentals.length).must_equal 2 end it "can have zero rentals" do + customer_two = customers(:curran) + + expect(customer_two.rentals.length).must_equal 0 end end describe "validations" do + before do + @customer = Customer.create(name: "Quinlan Rich", registered_at: "Fri, 10 Jul 2015 15:23:06 -0700", address: "Ap #727-9607 Nibh Avenue", city: "Hilo", state: "HI", postal_code: "63747", phone: "(521) 124-5753") + end + it "is valid when all fields are present" do + + expect(@customer.valid?).must_equal true + end + + it "is not valid if name is not present" do + @customer.name = nil + + expect(@customer.valid?).must_equal false end - it + it "is not valid if address is not present" do + @customer.address = nil + + expect(@customer.valid?).must_equal false + end + + it "is not valid if city is not present" do + @customer.city = nil + + expect(@customer.valid?).must_equal false + end + + it "is not valid if state is not present" do + @customer.state = nil + + expect(@customer.valid?).must_equal false + end + + it "is not valid if postal code is not present" do + @customer.postal_code = nil + + expect(@customer.valid?).must_equal false + end + + it "is not valid if phone is not present" do + @customer.phone = nil + + expect(@customer.valid?).must_equal false + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..7fde6a8ef 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,10 +1,17 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' +require 'minitest/rails' +require 'minitest/autorun' +require 'minitest/reporters' +require 'pry' + + +Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. fixtures :all - + # Add more helper methods to be used by all tests here... end From c55db47f52d9b8ba142c6def61b907ee14d6753a Mon Sep 17 00:00:00 2001 From: Hallie Date: Tue, 5 Nov 2019 15:46:14 -0800 Subject: [PATCH 06/23] movie model tests. --- app/models/movie.rb | 6 ++++ test/models/movie_test.rb | 59 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index b8b339cbc..c5fe262cc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,9 @@ class Movie < ApplicationRecord has_many :rentals + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true, numericality: {only_integer: true} + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index cd59ab14a..9fdc40eb0 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,60 @@ require "test_helper" describe Movie do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:movie) {movies(:blacksmith)} + let(:customer) { customers(:shelley) } + let(:customer2) { customers(:curran) } + + describe "relations" do + it "can have many rentals" do + Rental.create(movie_id: movie.id, customer_id: customer.id) + Rental.create(movie_id: movie.id, customer_id: customer2.id) + + expect(movie.rentals.length).must_equal 2 + end + + it "can have zero rentals" do + expect(movie.rentals.length).must_equal 0 + end + end + + describe "validations" do + before do + @movie = Movie.create(title: "Wizard of Oz", overview: "There's no place like home.", release_date: "1939-08-25", inventory: 5) + end + + it "is valid when all fields are present" do + expect(@movie.valid?).must_equal true + end + + it "is not valid when title is missing" do + @movie.title = nil + + expect(@movie.valid?).must_equal false + end + + it "is not valid when overview is missing" do + @movie.overview = nil + + expect(@movie.valid?).must_equal false + end + + it "is not valid when release_date is missing" do + @movie.release_date = nil + + expect(@movie.valid?).must_equal false + end + + it "is not valid when inventory is missing" do + @movie.inventory = nil + + expect(@movie.valid?).must_equal false + end + + it "is not valid when inventory is not an integer" do + @movie.inventory = "five" + + expect(@movie.valid?).must_equal false + end + end end From eceb631838010b90c74060e61de0b31e00db0684 Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Tue, 5 Nov 2019 16:08:08 -0800 Subject: [PATCH 07/23] Finished Wave 1 testing --- test/fixtures/rentals.yml | 6 ++++++ test/models/rental_test.rb | 40 +++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/rentals.yml diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..7e44ef56f --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,6 @@ +rental1: + checkout_date: "Wed 22 Apr 2015 07:54:14 -0700" + checkin_date: "Wed 27 Apr 2015 07:54:14 -0700" + due_date: "Wed 29 Apr 2015 07:54:14 -0700" + customer: :shelley + movie: :blacksmith \ No newline at end of file diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..2d17da629 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,41 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "relations" do + before do + @rental = rentals(:rental1) + end + + it "belongs to a movie" do + expect(@rental.movie).must_be_instance_of Movie + end + + it "belongs to a customer" do + expect(@rental.customer).must_be_instance_of Customer + end + end + + describe "validations" do + before do + movie = Movie.first + customer = Customer.first + @rental = Rental.create(movie_id: movie.id, customer_id: customer.id) + end + + it "is valid when all fields are present" do + expect(@rental.valid?).must_equal true + end + + it "is not valid when movie is missing" do + @rental.movie_id = nil + + expect(@rental.valid?).must_equal false + end + + it "is not valid when customer is missing" do + @rental.customer_id = nil + + expect(@rental.valid?).must_equal false + end + end end From 9b5d7819426d751ba8e46ae40700437a0833ca75 Mon Sep 17 00:00:00 2001 From: Hallie Date: Tue, 5 Nov 2019 16:30:07 -0800 Subject: [PATCH 08/23] Added customers route and index. --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/customers_controller.rb | 6 ++++++ config/routes.rb | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c3ac046f6c51a2cd4bc2df32c603e493458c382e GIT binary patch literal 6148 zcmeH~F^{dt=u>Bl;zddfqZjB=JE!l7EiIwCR znHYd=e=Zwf1hAw#vGy=AV?N-4FWm9?zTD5J+wJN_+D8XGrH`2G=e8gPq<|EV0#ZN< z%t(Pe#+RQndL})J6p#Y*P{6+rh3>4$))}7;h8O|Jf#oo+W0oL`7s#4yovhF-rw7Yc zi!sFO(N31Ut|nV&Z-?dZVR>isDTZdf9afmotOgXMfE1W0u;}^d=l`Dm-~2ymQ7Q$b zz?&&x!|t%#@}=@@{quTWKW5d}jZVhp3{O7+O#CQb(Zjf3d_mS^>tuzdAAyiTK?=N7 FfnTX=61e~X literal 0 HcmV?d00001 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..9a009426f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,8 @@ class CustomersController < ApplicationController + KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone] + + def index + customers = Customer.all.as_json(only: KEYS) + render json: customers, status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index b53201270..0bf5b714d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - + resources :customers, only: [:index, :show] end From 32c9ad5853216c716a3924d48824718ff74d9530 Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Tue, 5 Nov 2019 16:47:15 -0800 Subject: [PATCH 09/23] Added movies index and show controller methods --- app/controllers/movies_controller.rb | 17 ++++++++++++++++- config/routes.rb | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..88bd79837 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,17 @@ class MoviesController < ApplicationController -end + + def index + movies = Movie.all.as_json(only: [:id, :title, :release_date]) + render json: movies, status: :ok + end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + else + render json: {"errors" => ["not found"]}, status: :not_found + end + end +end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 0bf5b714d..3bf14b936 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show] + resources :movies, only: [:index, :show] end From 88f42cee516631c4ef74a4a697a75b9be0dd77c8 Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Wed, 6 Nov 2019 14:47:29 -0800 Subject: [PATCH 10/23] updated registered_at to default correctly --- app/controllers/customers_controller.rb | 2 +- db/migrate/20191106221227_set_default_registered_at.rb | 5 +++++ db/migrate/20191106222136_set_default_registered_at_2.rb | 5 +++++ .../20191106223831_delete_extra_registered_columns.rb | 6 ++++++ db/migrate/20191106223924_change_registed_at_column_name.rb | 5 +++++ db/schema.rb | 4 ++-- 6 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20191106221227_set_default_registered_at.rb create mode 100644 db/migrate/20191106222136_set_default_registered_at_2.rb create mode 100644 db/migrate/20191106223831_delete_extra_registered_columns.rb create mode 100644 db/migrate/20191106223924_change_registed_at_column_name.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 9a009426f..ab5995f34 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,5 @@ class CustomersController < ApplicationController - KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone] + KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at3, :registered_at, :created_at] def index customers = Customer.all.as_json(only: KEYS) diff --git a/db/migrate/20191106221227_set_default_registered_at.rb b/db/migrate/20191106221227_set_default_registered_at.rb new file mode 100644 index 000000000..7a37b2922 --- /dev/null +++ b/db/migrate/20191106221227_set_default_registered_at.rb @@ -0,0 +1,5 @@ +class SetDefaultRegisteredAt < ActiveRecord::Migration[5.2] + def change + add_column(:customers, :registered_at2, :datetime, :default => Time.now ) + end +end diff --git a/db/migrate/20191106222136_set_default_registered_at_2.rb b/db/migrate/20191106222136_set_default_registered_at_2.rb new file mode 100644 index 000000000..e7f9f6055 --- /dev/null +++ b/db/migrate/20191106222136_set_default_registered_at_2.rb @@ -0,0 +1,5 @@ +class SetDefaultRegisteredAt2 < ActiveRecord::Migration[5.2] + def change + add_column(:customers, :registered_at3, :datetime, default: -> { 'CURRENT_TIMESTAMP' } ) + end +end diff --git a/db/migrate/20191106223831_delete_extra_registered_columns.rb b/db/migrate/20191106223831_delete_extra_registered_columns.rb new file mode 100644 index 000000000..f716ce3ce --- /dev/null +++ b/db/migrate/20191106223831_delete_extra_registered_columns.rb @@ -0,0 +1,6 @@ +class DeleteExtraRegisteredColumns < ActiveRecord::Migration[5.2] + def change + remove_column(:customers, :registered_at) + remove_column(:customers, :registered_at2) + end +end diff --git a/db/migrate/20191106223924_change_registed_at_column_name.rb b/db/migrate/20191106223924_change_registed_at_column_name.rb new file mode 100644 index 000000000..eccd73ae5 --- /dev/null +++ b/db/migrate/20191106223924_change_registed_at_column_name.rb @@ -0,0 +1,5 @@ +class ChangeRegistedAtColumnName < ActiveRecord::Migration[5.2] + def change + rename_column(:customers, :registered_at3, :registered_at) + end +end diff --git a/db/schema.rb b/db/schema.rb index 7023d61be..e4c7fb8a1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,14 +10,13 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_05_223122) do +ActiveRecord::Schema.define(version: 2019_11_06_223924) 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" @@ -25,6 +24,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.datetime "registered_at", default: -> { "CURRENT_TIMESTAMP" } end create_table "movies", force: :cascade do |t| From 9100bc03246545ff9137222c2dc4d385df9f9fe4 Mon Sep 17 00:00:00 2001 From: Hallie Date: Wed, 6 Nov 2019 15:10:26 -0800 Subject: [PATCH 11/23] fixed model tests, added customer index tests. --- app/controllers/customers_controller.rb | 2 +- app/models/customer.rb | 2 +- test/controllers/customers_controller_test.rb | 39 +++++++++++++++++-- test/models/customer_test.rb | 2 +- test/models/movie_test.rb | 4 +- 5 files changed, 42 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ab5995f34..04a73431f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,5 @@ class CustomersController < ApplicationController - KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at3, :registered_at, :created_at] + KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at] def index customers = Customer.all.as_json(only: KEYS) diff --git a/app/models/customer.rb b/app/models/customer.rb index de70f31e5..291512c6d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord - has_many :rentals + has_many :rentals, :dependent => :nullify validates :name, presence: true validates :address, presence: true diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..999aa43de 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,40 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "index" do + it "responds with JSON and success" do + get customers_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "responds with an array of customer hashes" do + # Act + get customers_path + + # Get the body of the response + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal %w[id name address city state postal_code phone registered_at].sort + end + end + + it "will respond with an empty array when there are no customers" do + # Arrange + Customer.destroy_all + + # Act + get customers_path + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 3a4913465..840084e89 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -10,7 +10,7 @@ Rental.create(movie_id: movie.id, customer_id: customer.id) Rental.create(movie_id: movie2.id, customer_id: customer.id) - expect(customer.rentals.length).must_equal 2 + expect(customer.rentals.length).must_equal 3 end it "can have zero rentals" do diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 9fdc40eb0..df90dbe4a 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -10,10 +10,12 @@ Rental.create(movie_id: movie.id, customer_id: customer.id) Rental.create(movie_id: movie.id, customer_id: customer2.id) - expect(movie.rentals.length).must_equal 2 + expect(movie.rentals.length).must_equal 3 end it "can have zero rentals" do + rental = rentals(:rental1) + rental.destroy expect(movie.rentals.length).must_equal 0 end end From 91ae8026ca6a28b4c46d9cfca7bd5216c54247ab Mon Sep 17 00:00:00 2001 From: Hallie Date: Wed, 6 Nov 2019 15:17:35 -0800 Subject: [PATCH 12/23] Added movie and customer controller tests for index and show. --- app/models/movie.rb | 2 +- test/controllers/movies_controller_test.rb | 69 +++++++++++++++++++++- 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index c5fe262cc..0c4e6252d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord - has_many :rentals + has_many :rentals, :dependent => :nullify validates :title, presence: true validates :overview, presence: true diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b11d50cea..50106a864 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,70 @@ require "test_helper" describe MoviesController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "index" do + it "responds with JSON and success" do + get movies_path + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "responds with an array of movie hashes" do + # Act + get movies_path + + # Get the body of the response + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + body.each do |movie| + expect(movie).must_be_instance_of Hash + expect(movie.keys.sort).must_equal ["id", "release_date", "title"] + end + end + + it "will respond with an empty array when there are no movies" do + # Arrange + Movie.destroy_all + + # Act + get movies_path + body = JSON.parse(response.body) + + # Assert + expect(body).must_be_instance_of Array + expect(body).must_equal [] + end + end + + describe "show" do + it "will respond with one movie" do + movie = movies(:blacksmith) + + get movie_path(movie.id) + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + must_respond_with :ok + end + + it "will respond with the correct keys" do + movie = movies(:blacksmith) + + get movie_path(movie.id) + body = JSON.parse(response.body) + + expect(body.keys.sort).must_equal ["id", "inventory", "overview", "release_date", "title"] + expect(body["title"]).must_equal "Blacksmith Of The Banished" + end + + it "returns a not found error and status for an invalid movie" do + get movie_path(-1) + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Hash + must_respond_with :not_found + end + end end From b1e18d9800ec5b0a9793e4862fea1224f091b8fd Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Wed, 6 Nov 2019 15:53:55 -0800 Subject: [PATCH 13/23] movie create method and tests added --- app/controllers/movies_controller.rb | 17 ++++++++++++ config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 32 ++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 88bd79837..c46eb7413 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,4 +14,21 @@ def show render json: {"errors" => ["not found"]}, status: :not_found end end + + def create + new_movie = Movie.new(movie_params) + if new_movie.save + render json: new_movie.as_json(only: [:id]), status: :ok + return + else + render json: { ok: false, errors: new_movie.errors.messages }, status: :bad_request + return + end + end + + private + + def movie_params + params.permit(:id, :title, :overview, :release_date, :inventory) + end end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 3bf14b936..09002c577 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show] - resources :movies, only: [:index, :show] + resources :movies, only: [:index, :show, :create] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 50106a864..a324e66b1 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -67,4 +67,36 @@ must_respond_with :not_found end end + + before do + @movie = { + title: "This is a movie title", + overview: "This is it's overview", + release_date: "2019-12-25", + inventory: 5 + } + end + + it "can create a new movie" do + expect { + post movies_path, params: @movie + }.must_differ 'Movie.count', 1 + must_respond_with :ok + body = JSON.parse(response.body) + expect(body.keys).must_equal (['id']) + end + + it "will respond with bad_request for invalid data" do + # Arrange - using let from above + @movie[:title] = nil + expect { + # Act + post movies_path, params: @movie + # Assert + }.wont_change "Movie.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include "title" + end end From 2231a2741a8870347a239df4e238d2ef23f0e811 Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Wed, 6 Nov 2019 16:47:52 -0800 Subject: [PATCH 14/23] added missing describe statement and took id out of params --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 22 ++++++++ config/routes.rb | 3 + test/controllers/movies_controller_test.rb | 64 +++++++++++----------- 4 files changed, 59 insertions(+), 32 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c46eb7413..bfee6b68e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -29,6 +29,6 @@ def create private def movie_params - params.permit(:id, :title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end \ No newline at end of file diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..2a83e06c4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,24 @@ class RentalsController < ApplicationController + def checkout + new_rental = Rental.new(rental_params) + new_rental.checkout_date = Time.now + new_rental.due_date = Time.now + 7.days + if new_rental.save + render json: new_rental.as_json(only: [:id]), status: :ok + return + else + render json: { ok: false, errors: new_rental.errors.messages }, status: :bad_request + return + end + end + + def checkin + + end + + private + + def rental_params + params.permit(:movie_id, :customer_id, :checkout_date) + end end diff --git a/config/routes.rb b/config/routes.rb index 09002c577..1fad97852 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,7 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show] resources :movies, only: [:index, :show, :create] + + post "/rentals/check-out", to: "rentals#checkout" + post "/rentals/check-in", to: "rentals#checkin" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index a324e66b1..983267b10 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -68,35 +68,37 @@ end end - before do - @movie = { - title: "This is a movie title", - overview: "This is it's overview", - release_date: "2019-12-25", - inventory: 5 - } - end - - it "can create a new movie" do - expect { - post movies_path, params: @movie - }.must_differ 'Movie.count', 1 - must_respond_with :ok - body = JSON.parse(response.body) - expect(body.keys).must_equal (['id']) - end - - it "will respond with bad_request for invalid data" do - # Arrange - using let from above - @movie[:title] = nil - expect { - # Act - post movies_path, params: @movie - # Assert - }.wont_change "Movie.count" - must_respond_with :bad_request - expect(response.header['Content-Type']).must_include 'json' - body = JSON.parse(response.body) - expect(body["errors"].keys).must_include "title" + describe "create" do + before do + @movie = { + title: "This is a movie title", + overview: "This is it's overview", + release_date: "2019-12-25", + inventory: 5 + } + end + + it "can create a new movie" do + expect { + post movies_path, params: @movie + }.must_differ 'Movie.count', 1 + must_respond_with :ok + body = JSON.parse(response.body) + expect(body.keys).must_equal (['id']) + end + + it "will respond with bad_request for invalid data" do + # Arrange - using let from above + @movie[:title] = nil + expect { + # Act + post movies_path, params: @movie + # Assert + }.wont_change "Movie.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include "title" + end end -end +end \ No newline at end of file From cebff51258e9d85309741f197439153599427f22 Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Wed, 6 Nov 2019 16:57:40 -0800 Subject: [PATCH 15/23] Updated test naming error --- app/controllers/rentals_controller.rb | 22 ---------------------- config/routes.rb | 2 -- 2 files changed, 24 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2a83e06c4..58c72b791 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,24 +1,2 @@ class RentalsController < ApplicationController - def checkout - new_rental = Rental.new(rental_params) - new_rental.checkout_date = Time.now - new_rental.due_date = Time.now + 7.days - if new_rental.save - render json: new_rental.as_json(only: [:id]), status: :ok - return - else - render json: { ok: false, errors: new_rental.errors.messages }, status: :bad_request - return - end - end - - def checkin - - end - - private - - def rental_params - params.permit(:movie_id, :customer_id, :checkout_date) - end end diff --git a/config/routes.rb b/config/routes.rb index 1fad97852..27d5ed88e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,4 @@ resources :customers, only: [:index, :show] resources :movies, only: [:index, :show, :create] - post "/rentals/check-out", to: "rentals#checkout" - post "/rentals/check-in", to: "rentals#checkin" end From df2738da1ffe859a38d28c3d47086eaa92b21781 Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Thu, 7 Nov 2019 10:29:41 -0800 Subject: [PATCH 16/23] Added checkout method and tests --- app/controllers/rentals_controller.rb | 22 ++++++++ config/routes.rb | 2 + test/controllers/rentals_controller_test.rb | 62 ++++++++++++++++++++- 3 files changed, 83 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..82bd44041 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,24 @@ class RentalsController < ApplicationController + def checkout + new_rental = Rental.new(rental_params) + new_rental.checkout_date = Date.today + new_rental.due_date = Date.today + 7.days + if new_rental.save + render json: new_rental.as_json(only: [:id]), status: :ok + return + else + render json: { ok: false, errors: new_rental.errors.messages }, status: :bad_request + return + end + end + + def checkin + + end + + private + + def rental_params + params.permit(:movie_id, :customer_id, :checkout_date) + end end diff --git a/config/routes.rb b/config/routes.rb index 27d5ed88e..9d687f145 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,6 @@ resources :customers, only: [:index, :show] resources :movies, only: [:index, :show, :create] + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..ccdb54de3 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,63 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "checkout" do + before do + movie = Movie.first + customer = Customer.first + @rental = { + movie_id: movie.id, + customer_id: customer.id + } + end + + it "can create a new rental" do + expect { + post checkout_path, params: @rental + }.must_differ 'Rental.count', 1 + must_respond_with :ok + body = JSON.parse(response.body) + expect(body.keys).must_equal (['id']) + end + + it "will respond with bad_request for invalid data" do + # Arrange - using let from above + @rental[:movie_id] = nil + expect { + # Act + post checkout_path, params: @rental + # Assert + }.wont_change "Rental.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"].keys).must_include "movie" + end + + it "gives a valid checkout date" do + expect { + post checkout_path, params: @rental + }.must_differ 'Rental.count', 1 + must_respond_with :ok + body = JSON.parse(response.body) + + rental = Rental.find_by(id: body["id"]) + expect(rental.checkout_date).must_equal Date.today + end + + it "gives a due date 7 days after the checkout date" do + expect { + post checkout_path, params: @rental + }.must_differ 'Rental.count', 1 + must_respond_with :ok + body = JSON.parse(response.body) + + rental = Rental.find_by(id: body["id"]) + expect(rental.due_date).must_equal (Date.today + 7.days) + end + end + + describe "checkin" do + + end end From 9694d1357e237691ebb937779c7615060c11e66c Mon Sep 17 00:00:00 2001 From: Hallie Date: Thu, 7 Nov 2019 13:25:12 -0800 Subject: [PATCH 17/23] Passes movies checked out test. --- app/controllers/customers_controller.rb | 2 +- db/migrate/20191107212045_add_column_to_customers.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20191107212045_add_column_to_customers.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 04a73431f..a29e671c1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,5 @@ class CustomersController < ApplicationController - KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at] + KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at, :movies_checked_out_count] def index customers = Customer.all.as_json(only: KEYS) diff --git a/db/migrate/20191107212045_add_column_to_customers.rb b/db/migrate/20191107212045_add_column_to_customers.rb new file mode 100644 index 000000000..8299980a4 --- /dev/null +++ b/db/migrate/20191107212045_add_column_to_customers.rb @@ -0,0 +1,5 @@ +class AddColumnToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index e4c7fb8a1..7f3c7abe5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_06_223924) do +ActiveRecord::Schema.define(version: 2019_11_07_212045) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.datetime "registered_at", default: -> { "CURRENT_TIMESTAMP" } + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| From 4a184fd97c392b93121b23a32565e76aa5d44349 Mon Sep 17 00:00:00 2001 From: Hallie Date: Thu, 7 Nov 2019 13:44:34 -0800 Subject: [PATCH 18/23] Add available inventory column. --- app/controllers/movies_controller.rb | 5 +++-- .../20191107212744_add_available_inventory_to_movies.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20191107212744_add_available_inventory_to_movies.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index bfee6b68e..5e7fbbe45 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,7 @@ class MoviesController < ApplicationController def index - movies = Movie.all.as_json(only: [:id, :title, :release_date]) + movies = Movie.all.as_json(only: [:id, :title, :release_date, :available_inventory]) render json: movies, status: :ok end @@ -17,6 +17,7 @@ def show def create new_movie = Movie.new(movie_params) + if new_movie.save render json: new_movie.as_json(only: [:id]), status: :ok return @@ -31,4 +32,4 @@ def create def movie_params params.permit(:title, :overview, :release_date, :inventory) end -end \ No newline at end of file +end diff --git a/db/migrate/20191107212744_add_available_inventory_to_movies.rb b/db/migrate/20191107212744_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..9bcb714a6 --- /dev/null +++ b/db/migrate/20191107212744_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 7f3c7abe5..94def7eb0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_07_212045) do +ActiveRecord::Schema.define(version: 2019_11_07_212744) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From 28dd7b6d7c6cb0a88348fb590e7aa9e3239d3ca9 Mon Sep 17 00:00:00 2001 From: Hallie Date: Thu, 7 Nov 2019 14:53:50 -0800 Subject: [PATCH 19/23] added checked_out and available_inventory method. --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 12 ++++++++++- app/models/movie.rb | 5 +++++ app/models/rental.rb | 12 +++++++++++ db/seeds.rb | 4 +++- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 6 +++--- test/controllers/rentals_controller_test.rb | 21 +++++++++++++++++++ 8 files changed, 57 insertions(+), 7 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5e7fbbe45..93b0285b0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,7 +9,7 @@ def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + render json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]) else render json: {"errors" => ["not found"]}, status: :not_found end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 82bd44041..50aa782e4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,6 +4,7 @@ def checkout new_rental.checkout_date = Date.today new_rental.due_date = Date.today + 7.days if new_rental.save + new_rental.decrease_available() render json: new_rental.as_json(only: [:id]), status: :ok return else @@ -13,7 +14,16 @@ def checkout end def checkin - + rental = Rental.find_by(rental_params) + rental.checkin_date = Date.today + if rental.save + rental.increase_available() + render json: rental.as_json(only: [:id]), status: :ok + return + else + render json: { ok: false, errors: rental.errors.messages }, status: :bad_request + return + end end private diff --git a/app/models/movie.rb b/app/models/movie.rb index 0c4e6252d..aebb330dc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,4 +6,9 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, presence: true, numericality: {only_integer: true} + def available_count + if self.available_inventory.nil? + self.available_inventory = self.inventory - self.rentals.where(checkin_date: nil) + end + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..519f6fc7e 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,16 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + + def decrease_available + if self.movie.available_inventory.nil? + self.movie.available_inventory = self.movie.inventory - 1 + else + self.movie.available_inventory -= 1 + end + end + + def increase_available + self.movie.available_inventory += 1 + end end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..24c2f6ae7 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,5 +3,7 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + new_movie = Movie.create!(movie) + new_movie.available_inventory = new_movie.inventory + new_movie.save end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 999aa43de..eda8379d6 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -20,7 +20,7 @@ expect(body).must_be_instance_of Array body.each do |customer| expect(customer).must_be_instance_of Hash - expect(customer.keys.sort).must_equal %w[id name address city state postal_code phone registered_at].sort + expect(customer.keys.sort).must_equal %w[id name address city movies_checked_out_count state postal_code phone registered_at].sort end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 983267b10..c43df61b0 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -20,7 +20,7 @@ expect(body).must_be_instance_of Array body.each do |movie| expect(movie).must_be_instance_of Hash - expect(movie.keys.sort).must_equal ["id", "release_date", "title"] + expect(movie.keys.sort).must_equal ["available_inventory", "id", "release_date", "title"] end end @@ -55,7 +55,7 @@ get movie_path(movie.id) body = JSON.parse(response.body) - expect(body.keys.sort).must_equal ["id", "inventory", "overview", "release_date", "title"] + expect(body.keys.sort).must_equal ["available_inventory", "id", "inventory", "overview", "release_date", "title"] expect(body["title"]).must_equal "Blacksmith Of The Banished" end @@ -101,4 +101,4 @@ expect(body["errors"].keys).must_include "title" end end -end \ No newline at end of file +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index ccdb54de3..d8af3b87a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -58,6 +58,27 @@ end describe "checkin" do + before do + movie = Movie.first + customer = Customer.first + @rental = { + movie_id: movie.id, + customer_id: customer.id + } + end + it "can assign a checkin_date" do + expect { + post checkin_path, params: @rental + }.wont_change 'Rental.count' + + body = JSON.parse(response.body) + + rental = Rental.find_by(id: body["id"]) + expect(rental.checkin_date).must_equal Date.today + end + + it "will respond with bad_request for invalid data" do + end end end From 5cd58f0b4b9ad21ee819c368f660e329f9553dea Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Thu, 7 Nov 2019 15:42:31 -0800 Subject: [PATCH 20/23] Added test for check in method --- app/controllers/rentals_controller.rb | 9 +++++- app/models/rental.rb | 11 ++++++- test/controllers/rentals_controller_test.rb | 34 ++++++++++++++++++--- test/fixtures/movies.yml | 3 ++ 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 50aa782e4..6367101c0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -15,7 +15,14 @@ def checkout def checkin rental = Rental.find_by(rental_params) - rental.checkin_date = Date.today + + if rental + rental.checkin_date = Date.today + else + render json: { ok: false, errors: "This rental does not exist" }, status: :bad_request + return + end + if rental.save rental.increase_available() render json: rental.as_json(only: [:id]), status: :ok diff --git a/app/models/rental.rb b/app/models/rental.rb index 519f6fc7e..0f8063a5c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -5,12 +5,21 @@ class Rental < ApplicationRecord def decrease_available if self.movie.available_inventory.nil? self.movie.available_inventory = self.movie.inventory - 1 + self.movie.save else self.movie.available_inventory -= 1 + self.movie.save end end def increase_available - self.movie.available_inventory += 1 + if self.checkout_date != nil + if self.movie.available_inventory == nil + return "This movie has not been returned yet" + else + self.movie.available_inventory += 1 + self.movie.save + end + end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d8af3b87a..90518e024 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,7 +3,7 @@ describe RentalsController do describe "checkout" do before do - movie = Movie.first + movie = movies(:blacksmith) customer = Customer.first @rental = { movie_id: movie.id, @@ -12,12 +12,20 @@ end it "can create a new rental" do + expect { post checkout_path, params: @rental }.must_differ 'Rental.count', 1 + + # inventory = Rental.last.movie.available_inventory + must_respond_with :ok body = JSON.parse(response.body) expect(body.keys).must_equal (['id']) + + rental = Rental.find_by(id: body["id"]) + expect(rental.movie.available_inventory).must_equal ((movies(:blacksmith).available_inventory) - 1) + end it "will respond with bad_request for invalid data" do @@ -59,26 +67,42 @@ describe "checkin" do before do - movie = Movie.first + @movie = movies(:blacksmith) customer = Customer.first @rental = { - movie_id: movie.id, + movie_id: @movie.id, customer_id: customer.id } end - it "can assign a checkin_date" do + it "can assign a checkin_date and change available_inventory" do + post checkout_path, params: @rental + + inventory = Rental.last.movie.available_inventory + expect { post checkin_path, params: @rental }.wont_change 'Rental.count' body = JSON.parse(response.body) - + must_respond_with :ok rental = Rental.find_by(id: body["id"]) + expect(rental.movie.available_inventory).must_equal (inventory + 1) expect(rental.checkin_date).must_equal Date.today end it "will respond with bad_request for invalid data" do + # Arrange - using let from above + @rental[:movie_id] = nil + expect { + # Act + post checkin_path, params: @rental + # Assert + }.wont_change "Rental.count" + must_respond_with :bad_request + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + expect(body["errors"]).must_equal "This rental does not exist" end end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 89f2e14ab..6eee85ecf 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -3,15 +3,18 @@ blacksmith: overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life. release_date: 1979-01-18 inventory: 10 + available_inventory: 8 savior: title: Savior Of The Curse overview: The strange woman claims the boy has a DNA strain which very likely offers the key to cure several crippling diseases. Tests will have to be done but the key to save millions of lives is within the grasp of science through this DNA strain. Unsure what to think of all this and of this strange woman the boy hesitantly agrees to the proposal there's something exciting about this whole situation surely the right choice was made. release_date: 2010-11-05 inventory: 1 + available_inventory: 1 women: title: Women Of Destruction overview: But what if this strange woman is a con artist. Or what if everything told is completely true. How could an ordinary boy be relied upon in something this big. Time will tell. release_date: 2006-10-01 inventory: 1 + available_inventory: 1 From 4877e5bce4749881f462cf4f895ba71675dccefe Mon Sep 17 00:00:00 2001 From: Hallie Date: Fri, 8 Nov 2019 13:49:03 -0800 Subject: [PATCH 21/23] Created movies_checked_out_count. Passes ALL tests. --- app/models/rental.rb | 9 +++++++++ test/controllers/rentals_controller_test.rb | 18 +++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 0f8063a5c..03d685155 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -6,9 +6,15 @@ def decrease_available if self.movie.available_inventory.nil? self.movie.available_inventory = self.movie.inventory - 1 self.movie.save + + self.customer.movies_checked_out_count += 1 + self.customer.save else self.movie.available_inventory -= 1 self.movie.save + + self.customer.movies_checked_out_count += 1 + self.customer.save end end @@ -19,6 +25,9 @@ def increase_available else self.movie.available_inventory += 1 self.movie.save + + self.customer.movies_checked_out_count -= 1 + self.customer.save end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 90518e024..2d54ac461 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -63,6 +63,19 @@ rental = Rental.find_by(id: body["id"]) expect(rental.due_date).must_equal (Date.today + 7.days) end + + it "can change available_inventory and movies_checked_out_count" do + inventory = Rental.last.movie.available_inventory + checked_out = Rental.last.customer.movies_checked_out_count + + expect { post checkout_path, params: @rental }.must_differ 'Rental.count', 1 + + body = JSON.parse(response.body) + must_respond_with :ok + rental = Rental.find_by(id: body["id"]) + expect(rental.movie.available_inventory).must_equal (inventory - 1) + expect(rental.customer.movies_checked_out_count).must_equal (checked_out + 1) + end end describe "checkin" do @@ -75,10 +88,11 @@ } end - it "can assign a checkin_date and change available_inventory" do + it "can assign a checkin_date and change available_inventory and movies_checked_out_count" do post checkout_path, params: @rental inventory = Rental.last.movie.available_inventory + checked_out = Rental.last.customer.movies_checked_out_count expect { post checkin_path, params: @rental @@ -89,6 +103,8 @@ rental = Rental.find_by(id: body["id"]) expect(rental.movie.available_inventory).must_equal (inventory + 1) expect(rental.checkin_date).must_equal Date.today + + expect(rental.customer.movies_checked_out_count).must_equal (checked_out - 1) end it "will respond with bad_request for invalid data" do From 2cbd3545605338cef6fa7073a4b9a894514cc07f Mon Sep 17 00:00:00 2001 From: Hallie Date: Fri, 8 Nov 2019 13:53:46 -0800 Subject: [PATCH 22/23] Removed some garbage. --- app/models/movie.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index aebb330dc..0c4e6252d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,9 +6,4 @@ class Movie < ApplicationRecord validates :release_date, presence: true validates :inventory, presence: true, numericality: {only_integer: true} - def available_count - if self.available_inventory.nil? - self.available_inventory = self.inventory - self.rentals.where(checkin_date: nil) - end - end end From ed5067fee32cdd9fed36d0e143bca536a8d3c158 Mon Sep 17 00:00:00 2001 From: Brianna Kemp Date: Fri, 8 Nov 2019 15:05:03 -0800 Subject: [PATCH 23/23] Added sorting optional enhancement --- app/controllers/customers_controller.rb | 8 ++++- app/controllers/movies_controller.rb | 8 ++++- test/controllers/customers_controller_test.rb | 29 +++++++++++++++++++ test/controllers/movies_controller_test.rb | 23 +++++++++++++++ 4 files changed, 66 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a29e671c1..3075fe889 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,13 @@ class CustomersController < ApplicationController KEYS = [:id, :name, :address, :city, :state, :postal_code, :phone, :registered_at, :movies_checked_out_count] def index - customers = Customer.all.as_json(only: KEYS) + if ["name","registered_at", "postal_code"].include? params[:sort] + sort_value = params[:sort] + else + sort_value = "id" + end + + customers = Customer.order(sort_value).as_json(only: KEYS) render json: customers, status: :ok end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 93b0285b0..2e0e7db69 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,13 @@ class MoviesController < ApplicationController def index - movies = Movie.all.as_json(only: [:id, :title, :release_date, :available_inventory]) + if ["title","release_date"].include? params[:sort] + sort_value = params[:sort] + else + sort_value = "id" + end + + movies = Movie.order(sort_value).as_json(only: [:id, :title, :release_date, :available_inventory]) render json: movies, status: :ok end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index eda8379d6..868b4a19b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -36,5 +36,34 @@ expect(body).must_be_instance_of Array expect(body).must_equal [] end + + describe "optional enhancements" do + it "sorts by name correctly" do + get customers_path, params: {sort: "name"} + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body[0]["name"]).must_equal "Curran Stout" + expect(body[1]["name"]).must_equal "Shelley Rocha" + end + + it "sorts by postal code correctly" do + get customers_path, params: {sort: "postal_code"} + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body[0]["name"]).must_equal "Shelley Rocha" + expect(body[1]["name"]).must_equal "Curran Stout" + end + + it "sorts by registered_at value correctly" do + get customers_path, params: {sort: "registered_at"} + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body[0]["name"]).must_equal Customer.first.name + expect(body[1]["name"]).must_equal Customer.last.name + end + end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c43df61b0..1fc7c2d8a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -36,6 +36,29 @@ expect(body).must_be_instance_of Array expect(body).must_equal [] end + + describe "optional enhancements" do + it "sorts by title correctly" do + get movies_path, params: {sort: "title"} + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body[0]["title"]).must_equal "Blacksmith Of The Banished" + expect(body[1]["title"]).must_equal "Savior Of The Curse" + expect(body[2]["title"]).must_equal "Women Of Destruction" + end + + it "sorts by release date correctly" do + get movies_path, params: {sort: "release_date"} + + body = JSON.parse(response.body) + expect(body).must_be_instance_of Array + expect(body[0]["title"]).must_equal "Blacksmith Of The Banished" + expect(body[1]["title"]).must_equal "Women Of Destruction" + expect(body[2]["title"]).must_equal "Savior Of The Curse" + end + + end end describe "show" do