diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..a9f49bedc --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..731ec7c93 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + 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.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.6 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..52fbd8a84 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,6 @@ +class ApplicationController < ActionController::API + def render_error(status, errors) + render json: { errors: errors }, status: status + end + +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..78d28875a --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,28 @@ +class CustomersController < ApplicationController + + def index + customers = Customer.all + + render json: get_json(customers), status: :ok + end + + def show + customer = Customer.find_by(id: params[:id]) + + if customer + render json: get_json(customer), status: :ok + else + render_error(:not_found, {customer_id: ["Customer does not exist"] } ) + end + end + + + private + + def get_json(customer_data) + return customer_data.as_json(except: [:address, :city, :state, :created_at, :updated_at], methods: :movies_checked_out_count) + end + + + +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..41b740d97 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,38 @@ +class MoviesController < ApplicationController + + def index + movies = Movie.all + + render json: get_json(movies), status: :ok + end + + def show + movie = Movie.find_by(id: params[:id] ) + if movie + render json: get_json(movie), status: :ok + else + render_error(:not_found, { movie_id: ["No such movie exists"] }) + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: { id: movie.id }, status: :ok + else + render_error(:bad_request, movie.errors.messages) + end + end + + private + + def movie_params + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) + end + + + def get_json(movie_data) + return movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory], methods: :available_inventory) + end +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58935fe8a --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,49 @@ +class RentalsController < ApplicationController + + def checkout + rental = Rental.new(rental_params) + + if rental.is_available? + + rental.update_check_out_date + rental.update_due_date + + if rental.save + render json: { rental_id: rental.id } + else + render_error(:bad_request, rental.errors.messages) + end + + else + render_error(:not_found, { rental_id: ["Cannot checkout movie: no available inventory for checkout"] }) + end + end + + + def checkin + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + + if customer && movie + + rental = customer.find_rental(movie) + rental.update_checkin_date + + if rental.save + render json: { rental_id: rental.id } + else + render_error(:bad_request, rental.errors.messages) + end + + else + render_error(:not_found, { rental_id: ["No matching rental found for this customer and movie"] }) + end + end + + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end +end 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/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..f4c327ea4 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,16 @@ +class Customer < ApplicationRecord + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true + + has_many :rentals, dependent: :destroy + + def find_rental(movie) + self.rentals.each do |rental| + return rental if rental.movie == movie + end + return false + end + + def movies_checked_out_count + return self.rentals.where(checkin_date: nil).count + end +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..85865fcae --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,9 @@ +class Movie < ApplicationRecord + validates :title, :overview, :release_date, :inventory, presence: true + has_many :rentals, dependent: :destroy + + def available_inventory + checked_out = self.rentals.where(checkin_date: nil).count + return self.inventory - checked_out + end +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..1e88f5f05 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,27 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + + validates :customer_id, :movie_id, presence: true + validates :checkout_date, :due_date, presence: true, on: :checkout + validates :checkin_date, presence: true, on: :checkin + + DATE = Date.today + + def is_available? + return self.movie.available_inventory > 0 if self.movie + return false + end + + def update_check_out_date + return self.checkout_date = DATE + end + + def update_due_date + return self.due_date = (DATE + 7) + end + + def update_checkin_date + return self.checkin_date = DATE + end +end diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + +
+ + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..80ebfb356 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +PBmWdpoT2nz6sqBGvWe5PQ92o+jDF04Ft34ru3c7YcpBjcMalgKzKeUPKDlEMQISI/T93A7w+aNj5FLudEcc26dHxIF5F4o/+hwo9gtivDesRNAzWCBxpF+wX/9949i7oN9lXg9uIONd67WNYHBt1X0GQcBTyORxAAo+9FaRUJO6DN5HWwf0EdlYwugO60XULc2g5NMvCE+9cEMv9ztEZlMQ5MkpYeWMwWEqHvzAeHucBAwJY61gRt2yF4vcsBEbvUNwAyKbeswWdIj1oT4NRAXKTrQJKHM8rSc3iOC6N1jc8fe/zh2oCvkKcF0Peje4jvrgbjzh4lXSV3fB5kGxW4/g5vaMyVJRY6/LRx8ez+dcv3CVZyct6E+8lOwCkZetqRVGrRKajpGbYh13el3UgeJRX4YOHKvENAde--6fhHDxWqNVTJjSgG--lWjheuWgnGJwuZbgGzFm3w== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/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..c13c6b51d --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,10 @@ +Rails.application.routes.draw do + 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' + + resources :rentals + # 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/db/migrate/20181105200011_create_movies.rb b/db/migrate/20181105200011_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20181105200011_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20181105200217_create_customers.rb b/db/migrate/20181105200217_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20181105200217_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20181105202306_create_customers_movies_join.rb b/db/migrate/20181105202306_create_customers_movies_join.rb new file mode 100644 index 000000000..3913bd91f --- /dev/null +++ b/db/migrate/20181105202306_create_customers_movies_join.rb @@ -0,0 +1,8 @@ +class CreateCustomersMoviesJoin < ActiveRecord::Migration[5.2] + def change + create_table :customers_movies do |t| + t.belongs_to :customer, index: true + t.belongs_to :movie, index: true + end + end +end diff --git a/db/migrate/20181106221452_create_rentals.rb b/db/migrate/20181106221452_create_rentals.rb new file mode 100644 index 000000000..328e5f49a --- /dev/null +++ b/db/migrate/20181106221452_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181106222159_add_customer_id_to_rentals.rb b/db/migrate/20181106222159_add_customer_id_to_rentals.rb new file mode 100644 index 000000000..0c5d8d5d6 --- /dev/null +++ b/db/migrate/20181106222159_add_customer_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCustomerIdToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/migrate/20181106222349_add_movie_i_dto_rentals.rb b/db/migrate/20181106222349_add_movie_i_dto_rentals.rb new file mode 100644 index 000000000..9d4481177 --- /dev/null +++ b/db/migrate/20181106222349_add_movie_i_dto_rentals.rb @@ -0,0 +1,5 @@ +class AddMovieIDtoRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/migrate/20181106232259_add_checkout_date_to_rental.rb b/db/migrate/20181106232259_add_checkout_date_to_rental.rb new file mode 100644 index 000000000..596d86f11 --- /dev/null +++ b/db/migrate/20181106232259_add_checkout_date_to_rental.rb @@ -0,0 +1,5 @@ +class AddCheckoutDateToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkout_date, :date + end +end diff --git a/db/migrate/20181106232538_add_duedate_to_rental.rb b/db/migrate/20181106232538_add_duedate_to_rental.rb new file mode 100644 index 000000000..722aa9cc5 --- /dev/null +++ b/db/migrate/20181106232538_add_duedate_to_rental.rb @@ -0,0 +1,5 @@ +class AddDuedateToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :due_date, :date + end +end diff --git a/db/migrate/20181106232642_add_checkin_date_to_rental.rb b/db/migrate/20181106232642_add_checkin_date_to_rental.rb new file mode 100644 index 000000000..aac5b1ba3 --- /dev/null +++ b/db/migrate/20181106232642_add_checkin_date_to_rental.rb @@ -0,0 +1,5 @@ +class AddCheckinDateToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkin_date, :date + end +end diff --git a/db/migrate/20181106233709_add_available_inventory_to_movies.rb b/db/migrate/20181106233709_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..9bcb714a6 --- /dev/null +++ b/db/migrate/20181106233709_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/migrate/20181107005122_change_available_inventory_movies.rb b/db/migrate/20181107005122_change_available_inventory_movies.rb new file mode 100644 index 000000000..229033e59 --- /dev/null +++ b/db/migrate/20181107005122_change_available_inventory_movies.rb @@ -0,0 +1,7 @@ +class ChangeAvailableInventoryMovies < ActiveRecord::Migration[5.2] + def change + reversible do |dir| + dir.up{ Movie.update_all('available_inventory = inventory')} + end + end +end diff --git a/db/migrate/20181107171739_add_movies_checked_out_count_to_customers.rb b/db/migrate/20181107171739_add_movies_checked_out_count_to_customers.rb new file mode 100644 index 000000000..9aca60313 --- /dev/null +++ b/db/migrate/20181107171739_add_movies_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/migrate/20181107225754_remove_available_inventory_column.rb b/db/migrate/20181107225754_remove_available_inventory_column.rb new file mode 100644 index 000000000..5516ace5c --- /dev/null +++ b/db/migrate/20181107225754_remove_available_inventory_column.rb @@ -0,0 +1,5 @@ +class RemoveAvailableInventoryColumn < ActiveRecord::Migration[5.2] + def change + remove_column(:movies, :available_inventory) + end +end diff --git a/db/migrate/20181107230115_remove_movies_count_column.rb b/db/migrate/20181107230115_remove_movies_count_column.rb new file mode 100644 index 000000000..4609a2a32 --- /dev/null +++ b/db/migrate/20181107230115_remove_movies_count_column.rb @@ -0,0 +1,5 @@ +class RemoveMoviesCountColumn < ActiveRecord::Migration[5.2] + def change + remove_column(:customers, :movies_checked_out_count) + end +end diff --git a/db/migrate/20181107230339_drop_join_table.rb b/db/migrate/20181107230339_drop_join_table.rb new file mode 100644 index 000000000..61cf797d1 --- /dev/null +++ b/db/migrate/20181107230339_drop_join_table.rb @@ -0,0 +1,5 @@ +class DropJoinTable < ActiveRecord::Migration[5.2] + def change + drop_table :customers_movies + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..a34e10b36 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,53 @@ +# 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: 2018_11_07_230339) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.date "checkout_date" + t.date "due_date" + t.date "checkin_date" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" +end diff --git a/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/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..66f2e827c --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,72 @@ +require "test_helper" + +describe CustomersController do + + CUSTOMER_FIELDS = %w(id name movies_checked_out_count registered_at postal_code phone).sort + + def parse_json(expected_type:, expected_status: :success) + must_respond_with expected_status + + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + describe "index" do + it "is a real working route" do + get customers_path + + body = parse_json(expected_type: Array) + + expect(body.length).must_equal Customer.count + + body.each do |customer| + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it "returns an empty array when there are no customers" do + Customer.destroy_all + + get customers_path + + body = parse_json(expected_type: Array) + + expect(body).must_equal [] + end + end + + describe 'show' do + let(:customer) { customers(:customer_1) } # has 3 movies checked out in yml + + it 'is a real working route and returns JSON for an existing customer' do + + get customer_path(customer.id) + + body = parse_json(expected_type: Hash) + + expect( body["id"] ).must_equal customer["id"] + expect( body["name"] ).must_equal customer["name"] + expect( body["registered_at"]).must_equal customer["registered_at"] + expect( body["postal_code"] ).must_equal customer["postal_code"] + expect( body["phone"] ).must_equal customer["phone"] + + expect( body["movies_checked_out_count"] ).must_equal 3 + end + + + it 'returns JSON with an error message and status code for a customer that DNE' do + customer_id = Customer.last.id + 1 + + get customer_path(customer_id) + + body = parse_json(expected_type: Hash, expected_status: :not_found) + + expect(body["errors"]).must_include "customer_id" + expect(body.values.first["customer_id"]).must_equal ["Customer does not exist"] + end + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..8d5b0a623 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,168 @@ +require "test_helper" +require "date" +require 'pry' + +describe MoviesController do + + MOVIE_FIELDS = %w(id title release_date available_inventory inventory overview).sort + + #helper method used to DRY up code + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + describe "index" do + it "should get index" do + # Act + get movies_path + + # Assert + body = check_response(expected_type: Array) + + expect(body.length).must_equal Movie.count + + #test what is rendered in JSON => returned + body.each do |movie| + expect(movie.keys.sort).must_equal MOVIE_FIELDS + end + end + + it "returns an empty array when there are no movies" do + #arrange + Movie.destroy_all + + #act - invoke controller action by calling path + get movies_path + + #assert + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + end + + describe 'show' do + it 'is a real working route and returns JSON for an existing movie' do + movie = Movie.first # 0 available inventory, per yml + + get movie_path(movie.id) + + body = check_response(expected_type: Hash) + + movie.release_date = movie.release_date.to_s + movie.save + + expect(body["id"]).must_equal movie["id"] + expect(body["title"]).must_equal movie["title"] + expect(body["release_date"].to_s).must_equal movie["release_date"].to_s + expect(body["overview"]).must_equal movie["overview"] + + expect( body["available_inventory"] ).must_equal 0 + end + + + it 'returns JSON with an error message and status code for a movie that DNE' do + movie_id = Movie.last.id + 1 + + get movie_path(movie_id) + + body = check_response(expected_type: Hash, expected_status: :not_found) + + expect(body["errors"]).must_include "movie_id" + expect(body.values.first["movie_id"]).must_equal ["No such movie exists"] + end + end + + describe "create" do + let(:movie_data) { + { + title: "test title", + overview: "test overview", + release_date: Date.parse("2018-04-12"), + inventory: 10 + } + } + + it "creates a new movie given valid data" do + + expect { + post movies_path, params: movie_data + }.must_change('Movie.count', +1) + + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "returns an error for invalid movie title" do + movie_data["title"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change("Movie.count") + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + + it "returns an error for invalid movie overview" do + movie_data["overview"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change("Movie.count") + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "overview" + must_respond_with :bad_request + end + + it "returns an error for invalid movie release_date" do + movie_data["release_date"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change("Movie.count") + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "release_date" + must_respond_with :bad_request + end + + it "returns an error for invalid movie inventory" do + movie_data["inventory"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change("Movie.count") + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "inventory" + must_respond_with :bad_request + end + end + +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..0f71c7e10 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,129 @@ +require "test_helper" +require "pry" + +describe RentalsController do + + RENTAL_FIELDS = %w(id customer_id movie_id checkout_date due_date checkin_date).sort + + def parse_json(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + describe 'checkout' do + let(:mimi) { customers(:customer_4) } + let(:jaws) { movies(:movie_2) } + + let(:rental_params) { + { customer_id: mimi.id, + movie_id: jaws.id + } + } + it "creates a new rental and returns JSON with an id when give valid input" do + + expect { + post checkout_path, params: rental_params + }.must_change('Rental.count', +1) + + body = parse_json(expected_type: Hash) + + expect(body.keys).must_include "rental_id" + + rental = Rental.last + expect(rental.customer_id).must_equal rental_params[:customer_id] + expect(rental.movie_id).must_equal rental_params[:movie_id] + expect(rental.checkout_date).must_equal Date.today + expect(rental.due_date).must_equal (Date.today + 7) + + end + + it "renders bad_request status code and returns JSON with error messages if the rental was not successfully saved" do + + # QUESTION: not sure how to setup the controller test and make saving the rental fail. Checkout date and due date is not a required validation until trying to save upon checkout. The rental.save method would fail if checkout_date and due_date somehow returns nil or false upon checkout, and therefore return the error messages...but this is difficult to test in the controller tests using the post checkout_path bc valid params would always save the rental. + end + + it 'renders not_found and does not save rental if no rental information matches params' do + + original_last_rental = Rental.last + rental_params[:movie_id] = nil + + expect { + post checkout_path, params: rental_params + }.wont_change('Rental.count') + + rental = Rental.last + body = parse_json(expected_type: Hash, expected_status: :not_found) + expect(rental).must_equal original_last_rental + expect(body.keys).must_include "errors" + expect(body.values.first["rental_id"]).must_equal ["Cannot checkout movie: no available inventory for checkout"] + + end + end + + describe 'checkin' do + + let(:rental) { rentals(:rental_3) } + + let(:rental_params) { + { customer_id: rental.customer.id, # id: 1 + movie_id: rental.movie.id # id: 2 + } + } + + it 'checks-in the correct rental with valid input params and updates the checkin date to today' do + + to_check_in_rental = Rental.find_by(customer_id: 1, movie_id: 2) + + to_check_in_rental.checkin_date.must_be_nil + + post checkin_path, params: rental_params + + body = parse_json(expected_type: Hash) + + checked_in_rental = Rental.find_by(customer_id: 1, movie_id: 2) + + expect(body.keys).must_include "rental_id" + expect(checked_in_rental.checkin_date).must_equal Date.today + + end + + it "renders bad_request status code and returns JSON with error messages if the rental was not successfully saved" do + # same question as above + end + + it "renders not found status code and returns JSON with error message if no movie matches movie params" do + + expect(rental.checkin_date).must_be_nil + rental_params[:movie_id] = 0 + + post checkin_path, params: rental_params + + body = parse_json(expected_type: Hash, expected_status: :not_found) + expect(rental.checkin_date).must_be_nil + expect(body.keys).must_include "errors" + expect(body.values.first["rental_id"]).must_equal ["No matching rental found for this customer and movie"] + + end + + it 'renders not found status code and returns JSON with error message if no customer matches customer params' do + expect(rental.checkin_date).must_be_nil + + rental_params[:customer_id] = nil + + post checkin_path, params: rental_params + + body = parse_json(expected_type: Hash, expected_status: :not_found) + expect(rental.checkin_date).must_be_nil + expect(body.keys).must_include "errors" + expect(body.values.first["rental_id"]).must_equal ["No matching rental found for this customer and movie"] + end + + end + + + +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..2887015d3 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,41 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +customer_1: + id: 1 + name: Jackson + registered_at: 2015-10-11 12:02:17 + address: 1234 East Street + city: New York + state: NY + postal_code: 10201 + phone: 206-111-2342 + +customer_2: + id: 2 + name: Izzie + registered_at: 2012-10-22 12:02:17 + address: 4321 West Street + city: Boston + state: MA + postal_code: 90821 + phone: 123-421-4122 + +customer_3: + id: 3 + name: Any + registered_at: 2012-10-22 12:02:17 + address: 25 West Street + city: Orlando + state: FL + postal_code: 90844 + phone: 123-421-4122 + +customer_4: + id: 4 + name: Many + registered_at: 2012-10-22 12:02:17 + address: 1920 West Roosevelt + city: Chicago + state: IL + postal_code: 90821 + phone: 555-252-1234 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..a1952ed9a --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,22 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +movie_1: + id: 1 + title: Rails on Rails + overview: This is a movie all about rails. It's railly railly awesome. + release_date: 2020-09-02 + inventory: 2 + +movie_2: + id: 2 + title: Ruby is The Best + overview: The most amazing movie you will ever see. + release_date: 2011-01-20 + inventory: 3 + +movie_3: + id: 3 + title: Rubyist are the best + overview: The most amazing ruby film you've ever dreamt of. + release_date: 2012-01-20 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..5463bf8f5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,47 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +rental_1: + customer_id: 1 + movie_id: 1 + checkout_date: 2012-11-12 + checkin_date: nil + due_date: 2012-11-19 + +rental_2: + customer_id: 2 + movie_id: 1 + checkout_date: 2012-11-12 + checkin_date: nil + due_date: 2012-11-19 + +rental_3: + customer_id: 1 + movie_id: 2 + checkout_date: 2012-12-12 + checkin_date: nil + due_date: 2012-12-19 + +rental_4: + customer_id: 3 + movie_id: 2 + checkout_date: nil + checkin_date: 2012-12-14 + due_date: nil + +rental_5: + customer_id: 4 + movie_id: 2 + checkout_date: nil + checkin_date: 2018-10-10 + due_date: nil + +rental_6: + customer_id: 1 + movie_id: 3 + checkout_date: 2018-10-10 + checkin_date: nil + due_date: 2018-10-17 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..40877e002 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,116 @@ +require "test_helper" + +describe Customer do + + # VALIDATIONS + describe 'validations' do + let(:customer) { customers(:customer_1) } + + it 'is invalid without a name' do + customer.name = nil + + customer.name.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without a registration date' do + customer.registered_at = nil + + customer.registered_at.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without an address' do + customer.address = nil + + customer.address.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without a city' do + customer.city = nil + + customer.city.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without a state' do + customer.state = nil + + customer.state.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without a postal_code' do + customer.postal_code = nil + + customer.postal_code.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is invalid without a phone number' do + customer.phone = nil + + customer.phone.must_be_nil + expect(customer).must_be :invalid? + end + + it 'is valid with all fields present' do + expect(customer).must_be :valid? + end + + end + + + # RELATIONS + describe 'relations' do + let(:jackson) { customers(:customer_2) } + let(:titanic) { movies(:movie_1) } + let(:finding_nemo) { movies(:movie_2) } + + it 'can set and relate to rentals' do + blockbuster_1 = Rental.create(customer: jackson, movie: titanic) + blockbuster_2 = Rental.create(customer: jackson, movie: finding_nemo) + + expect( jackson ).must_respond_to :rentals + jackson.rentals.each do |rental| + rental.must_be_kind_of Rental + end + + expect( jackson.rentals.count ).must_equal 3 + # the newly created rentals + 1 rental in yml file + end + end + + # CUSTOM METHODS + describe 'find_rental' do + let(:molly) { customers(:customer_1) } + let(:movie) { movies(:movie_1) } + let(:matching_rental) { rentals(:rental_1) } + + it 'returns the correct matching rental from the matching movie found' do + expect( molly.find_rental(movie) ).must_equal matching_rental + end + + it "returns false if no rental matches movies from customer's rentals" do + no_movie = nil + + expect( molly.find_rental(no_movie) ).must_equal false + end + end + + describe 'movies_checked_out_count' do + let(:molly_three_out) { customers(:customer_1) } + let(:mike_none_out) { customers(:customer_3) } + + it "returns the correct movies checked out count" do + expect( molly_three_out.movies_checked_out_count ).must_equal 3 + end + + it 'returns 0 if there are no movies checked out' do + expect( mike_none_out.movies_checked_out_count ).must_equal 0 + end + + end + +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..9c0898b64 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,80 @@ +require "test_helper" + +describe Movie do + + # VALIDATIONS + describe 'validations' do + let(:movie) { movies(:movie_1) } + + it 'is invalid without a title' do + movie.title = nil + + movie.title.must_be_nil + expect(movie).must_be :invalid? + end + + it 'is invalid without an overview' do + movie.overview = nil + + movie.overview.must_be_nil + expect(movie).must_be :invalid? + end + + it 'is invalid without a release date' do + movie.release_date = nil + + movie.release_date.must_be_nil + expect(movie).must_be :invalid? + end + + it 'is invalid without an inventory' do + movie.inventory = nil + + movie.inventory.must_be_nil + expect(movie).must_be :invalid? + end + + it 'is valid with all fields present' do + expect(movie).must_be :valid? + end + end + + + # RELATIONS + describe 'relations' do + let(:titanic) { movies(:movie_2) } + let(:jackson) { customers(:customer_2) } + let(:avery) { customers(:customer_4) } + + it 'can set and relate to rentals' do + blockbuster_1 = Rental.create(customer: jackson, movie: titanic) + blockbuster_2 = Rental.create(customer: avery, movie: titanic) + + expect( titanic ).must_respond_to :rentals + titanic.rentals.each do |rental| + rental.must_be_kind_of Rental + end + expect( titanic.rentals.count ).must_equal 5 + # the 2 new rentals + 3 rentals in the yml file + end + + end + + # CUSTOM METHODS + describe 'available_inventory' do + let(:customer) { customers(:customer_1) } + let(:two_available_movies) { movies(:movie_2) } + let(:no_available_movie) { movies(:movie_3) } + + it 'returns the correct available inventory for available movies' do + expect( two_available_movies.available_inventory ).must_equal 2 + end + + it 'returns 0 if all movies checked out' do + expect( no_available_movie.available_inventory ).must_equal 0 + end + + end + + +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..eabbfe00f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,133 @@ +require "test_helper" + +describe Rental do + + # VALIDATIONS + describe 'validations' do + let(:rental) { rentals(:rental_1) } + + it 'is invalid without customer_id' do + rental.customer_id = nil + + rental.customer.must_be_nil + expect(rental.valid?).wont_equal true + end + + it 'is invalid without movie_id' do + rental.movie_id = nil + + rental.movie.must_be_nil + expect(rental.valid?).wont_equal true + end + + it 'is valid with only customer and movie ids present' do + rental.checkout_date = nil + rental.due_date = nil + + expect(rental).must_be :valid? + end + end + + # RELATIONS + describe 'relations' do + let(:movie) { movies(:movie_2) } + let(:customer) { customers(:customer_3) } + + let(:rental) { rentals(:rental_2)} + + it 'can set a customer and movie' do + leo = customer + titanic = movie + new_rental = Rental.create(customer: leo, movie: titanic) + + expect( new_rental.valid? ).must_equal true + expect( new_rental.customer ).must_equal leo + expect( new_rental.movie ).must_equal titanic + end + + it "must relate to a movie" do + expect( rental ).must_respond_to :movie + expect( rental.movie ).must_equal movies(:movie_1) + end + + it "must relate to a customer" do + expect( rental ).must_respond_to :customer + expect( rental.customer ).must_equal customers(:customer_2) + end + end + + # CUSTOM METHODS + describe 'is_available?' do + let(:linda) { customers(:customer_4) } + let(:all_checked_out) { movies(:movie_3) } + let(:available_for_check_out) { movies(:movie_2) } + let(:rental_data) { + { + customer_id: linda.id, + movie_id: all_checked_out.id, + } + } + + it 'returns false if the movie for rental is not available' do + new_rental = Rental.create(rental_data) + + expect( new_rental.is_available? ).must_equal false + end + + it 'returns true if the movie for rental is available' do + rental_data[:movie_id] = available_for_check_out.id + new_rental = Rental.create(rental_data) + + expect( new_rental.is_available? ).must_equal true + end + + it 'returns false if the rental movie is nil' do + rental_data[:movie_id] = nil + new_rental = Rental.create(rental_data) + + expect( new_rental.is_available? ).must_equal false + end + end + + DATE = Date.today + + describe 'update_check_out_date' do + let(:movie) { movies(:movie_3) } + let(:jackson) { customers(:customer_1) } + + it "updates checkout date to today's date" do + new_rental = Rental.create(customer: jackson, movie: movie) + + new_rental.update_check_out_date + + expect( new_rental.checkout_date ).must_equal DATE + end + end + + describe 'update_due_date' do + let(:movie) { movies(:movie_3) } + let(:jackson) { customers(:customer_1) } + + it "updates the due date to 7 days from today's date" do + new_rental = Rental.create(customer: jackson, movie: movie) + + new_rental.update_due_date + + expect( new_rental.due_date ).must_equal (DATE + 7) + end + end + + describe 'update_checkin_date' do + let(:movie) { movies(:movie_3) } + let(:jackson) { customers(:customer_1) } + + it "updates checkin date to today's date" do + rental = Rental.create(customer: jackson, movie: movie) + + rental.update_checkin_date + + expect( rental.checkin_date ).must_equal DATE + end + end + +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..01cbd4fc1 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,27 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +require 'pry' +require 'date' +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb