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..e54d447e8 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.4.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..1d10e5eb5 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.4.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..e810c083c --- /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.4.1p111 + +BUNDLED WITH + 1.17.1 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..3fd53645c --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +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..93da6f437 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,13 @@ +class CustomersController < ApplicationController + + def index + customer = Customer.all + render json: jsonify(customer) + end + + private + + def jsonify(customer_data) + return customer_data.as_json( only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :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..cc88cc9ca --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,39 @@ +class MoviesController < ApplicationController + + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok + end + + def show + movie_id = params[:id] + movie = Movie.find_by(id: movie_id) + + if movie + avail = movie.calculate_available_inventory + result = movie.save_available_inventory(avail) + + render json: movie.as_json(except: [:created_at, :updated_at]), status: :ok + else + render_error(:not_found, {movie_id: ["no such movie"]}) + end + end + + def create + movie = Movie.new(movie_params) + + result = movie.save + if result + movie_id = movie.id + render json: movie.as_json(only: :id), status: :ok + else + render_error(:bad_request, movie.errors.messages) + end + end + + private + def movie_params + params.permit(:id, :title, :overview, :release_date, :inventory) + end + +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..18f8cba5c --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,63 @@ +require 'pry' +class RentalsController < ApplicationController + + def index + rentals = Rental.all + render json: rentals.as_json(only: [:id, :customer_id, :movie_id]), status: :ok + end + + def checkout + + # check_out = Date.today.to_s + # due_date = (Date.today+7).to_s + # + # movie_id = params[:movie_id].to_i + # movie = Movie.find_by(id: movie_id) + movie = Movie.find_by(id: rental_params[:movie_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) + # customer_id = params[:customer_id].to_i + # customer = Customer.find_by(id: customer_id) + if movie == nil || customer == nil + render json: {errors: "No movie checked out, missing movie or customer"}, status: :bad_request + else + if movie.available_inventory > 0 + rental = Rental.new(rental_params) + if rental.save + inventory = movie.calculate_available_inventory() + movie.save_available_inventory(inventory) + customer[:movies_checked_out_count] += 1 + customer.save + render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + else + render_error(:bad_request, rental.errors.messages) + end + else + render json: {errors: "No available movies in inventory"}, status: :ok + end + end + end + + def checkin + movie = Movie.find_by(id: rental_params[:movie_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) + if movie == nil || customer == nil + render json: {errors: "Not checked in. Customer or Movie id is invalid"}, status: :not_found + else + rental = Rental.find_by(movie_id: movie.id, customer_id: rental_params[:customer_id], checkedout: true) + if rental.update(checkedout: false) + inventory = movie.calculate_available_inventory() + movie.save_available_inventory(inventory) + customer[:movies_checked_out_count] -= 1 + customer.save + render json: rental.as_json(except: [:created_at, :updated_at]), status: :ok + else + render_error(:not_found, rental.errors.messages) + end + end + end + + + def rental_params + {movie_id: params[:movie_id], customer_id: params[:customer_id], check_out: Date.today.to_s, due_date: (Date.today + 7).to_s} + 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..8ba5a89c7 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,5 @@ +class Customer < ApplicationRecord + has_many :rentals, dependent: :delete_all + + +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..972aec577 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,57 @@ +class Movie < ApplicationRecord + has_many :rentals, dependent: :delete_all + + validates :title, presence: true, uniqueness: { scope: :release_date } + validates :release_date, presence: true + validate :checks_valid_release_date + validates :inventory, presence: true, numericality: { greater_than_or_equal_to: 0, only_integer: true } + validates :available_inventory, numericality: { greater_than_or_equal_to: 0, only_integer: true } + + + + def calculate_checked_out_rentals() + rentals = self.rentals + + rented_inventory = rentals.count { |rental| rental.checked_out? } + + return rented_inventory + end + + def calculate_available_inventory() + total_inventory = self.inventory + # QUESTION: will we be doing counter_cache? + rented_inventory = calculate_checked_out_rentals() + + available_inventory = total_inventory - rented_inventory + + if !(available_inventory >= 0) + # We decided to return 0 in this case since if the value somehow dips below 0, then user shouldn't be able to rent this particular movie + return 0 + else + + return available_inventory + end + end + + def save_available_inventory(calculate_available_inventory) + available_inventory = calculate_available_inventory + + self.available_inventory = available_inventory + result = self.save + + if !result + # NOTE: this is for our benefit; not the user's - it is unlikely they will reach this point given safeguards in calculate_available_inventory. + raise StandardError, "Unable to save available inventory: must be a non-negative integer" + end + + return result + end + + def checks_valid_release_date + if !release_date.nil? + if !release_date.is_a?(Date) + errors.add(:release_date, "Invalid release date. Must be in the format: YYYY-MM-DD") + end + end + end +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..66d03a91f --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,21 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer + + validates :customer_id, presence: true + validates :movie_id, presence: true + + def checked_out?() + return self.checkedout == true + end + + + # def calculate_checked_out_rentals() + # rentals = self.rentals + # + # rented_inventory = rentals.sum { |rental| rental.checkout==true } + # + # return rented_inventory + # 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..43bce1990 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +N5S6iuPe3kCH4Vc71s5bmDYiJh2Epefm2wlakO5soQbke1l7jF3Dh/RpvHgZIBslqYqaiX86TNDwRQoskDUEkMGbbwBU+OdTraTrUlk93Qh2FuOEDZ9fDGvvgtN4ciNiw6I9pfBSj1BEFNaswA08l48R9waov+TuWAl6+BDX/vh3+VmTvqH5zHWbeR9bRQa1rRfjcJPMqv1AOtHktkwecgoCsSR767ZgDQUdZWz4bg2qgoCnjFOFhNSE9ufWGMATu+YCH8f6U2P6l3RrtBL+oGuF0ZFo/MZXj9EzXLihHLXillhoESAuedwplr+3eaBQpGxW3UzvIOEwHktiigYlKo24sk7rvPmyf5ykWRSgUj9/vVWsGjPnTiKYk0uiR9pvf4Itxr1qOe3Grjei1wwSQPe4tK8so4wbCkWq--Iap78QuIBEXZuN6O--GNWmBAvCbwynanIKwWAFOw== \ 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..8e581b02c --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,11 @@ +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] + resources :movies, only: [:index, :show, :create] + resources :rentals, only: [:index] + + + post 'rentals/check-out', to: 'rentals#checkout', as: 'checkout' + post 'rentals/check-in', to: 'rentals#checkin', as: 'checkin' +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/20181105214012_create_movies.rb b/db/migrate/20181105214012_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20181105214012_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/20181105214155_create_customers.rb b/db/migrate/20181105214155_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20181105214155_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/20181105214357_create_rentals.rb b/db/migrate/20181105214357_create_rentals.rb new file mode 100644 index 000000000..bbb9344ed --- /dev/null +++ b/db/migrate/20181105214357_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :check_in + t.date :check_out + + t.timestamps + end + end +end diff --git a/db/migrate/20181105215003_inventory_default.rb b/db/migrate/20181105215003_inventory_default.rb new file mode 100644 index 000000000..07d66029f --- /dev/null +++ b/db/migrate/20181105215003_inventory_default.rb @@ -0,0 +1,5 @@ +class InventoryDefault < ActiveRecord::Migration[5.2] + def change + change_column :movies, :inventory, :integer, default: 0 + end +end diff --git a/db/migrate/20181105220531_addrentalreferences.rb b/db/migrate/20181105220531_addrentalreferences.rb new file mode 100644 index 000000000..5663dc76f --- /dev/null +++ b/db/migrate/20181105220531_addrentalreferences.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/migrate/20181106193433_add_movies_checked_out_column_to_customer.rb b/db/migrate/20181106193433_add_movies_checked_out_column_to_customer.rb new file mode 100644 index 000000000..a2f46d8d4 --- /dev/null +++ b/db/migrate/20181106193433_add_movies_checked_out_column_to_customer.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutColumnToCustomer < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/migrate/20181106202745_add_avail_inv_to_movies.rb b/db/migrate/20181106202745_add_avail_inv_to_movies.rb new file mode 100644 index 000000000..6956d73a5 --- /dev/null +++ b/db/migrate/20181106202745_add_avail_inv_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailInvToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/migrate/20181106220933_change_rentals_column_name_check_in_to_due_date.rb b/db/migrate/20181106220933_change_rentals_column_name_check_in_to_due_date.rb new file mode 100644 index 000000000..fd56389ee --- /dev/null +++ b/db/migrate/20181106220933_change_rentals_column_name_check_in_to_due_date.rb @@ -0,0 +1,5 @@ +class ChangeRentalsColumnNameCheckInToDueDate < ActiveRecord::Migration[5.2] + def change + rename_column :rentals, :check_in, :due_date + end +end diff --git a/db/migrate/20181107183617_add_checked_out_column_to_rentals.rb b/db/migrate/20181107183617_add_checked_out_column_to_rentals.rb new file mode 100644 index 000000000..a37cbe58a --- /dev/null +++ b/db/migrate/20181107183617_add_checked_out_column_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCheckedOutColumnToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkedout, :boolean, default: true + end +end diff --git a/db/migrate/20181107185036_add_default_value_to_movies_available_inventory_column.rb b/db/migrate/20181107185036_add_default_value_to_movies_available_inventory_column.rb new file mode 100644 index 000000000..fcf35a879 --- /dev/null +++ b/db/migrate/20181107185036_add_default_value_to_movies_available_inventory_column.rb @@ -0,0 +1,5 @@ +class AddDefaultValueToMoviesAvailableInventoryColumn < ActiveRecord::Migration[5.2] + def change + change_column_default :movies, :available_inventory, 0 + end +end diff --git a/db/migrate/20181108171823_add_no_false_to_inventory_column.rb b/db/migrate/20181108171823_add_no_false_to_inventory_column.rb new file mode 100644 index 000000000..20786efc9 --- /dev/null +++ b/db/migrate/20181108171823_add_no_false_to_inventory_column.rb @@ -0,0 +1,5 @@ +class AddNoFalseToInventoryColumn < ActiveRecord::Migration[5.2] + def change + change_column_null(:movies, :inventory, false) + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..8fe31936c --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,55 @@ +# 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_08_171823) 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 + t.integer "movies_checked_out_count", default: 0 + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory", default: 0, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "available_inventory", default: 0 + end + + create_table "rentals", force: :cascade do |t| + t.date "due_date" + t.date "check_out" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.boolean "checkedout", default: true + 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..2165d8109 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,35 @@ +require "test_helper" + +describe CustomersController do + CUSTOMER_FIELDS = %w(id name registered_at address city state postal_code phone movies_checked_out_count).sort + + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + + describe "index" do + it "successfully returns a list of existing customers" do + get customers_path + + body = check_response(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 = check_response(expected_type: Array) + expect(body).must_equal [] + 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..75e51a827 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,93 @@ +require "test_helper" + +describe MoviesController do + 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 + MOVIE_FIELDS_INDEX = %w(id title release_date).sort + + it "successfully returns a list of existing movies" do + get movies_path + + body = check_response(expected_type: Array) + + expect(body.length).must_equal Movie.count + + body.each do |movie| + expect(movie.keys.sort).must_equal MOVIE_FIELDS_INDEX + end + end + + it "returns an empty array when there are no movies" do + Movie.destroy_all + get movies_path + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + end + + describe 'show' do + MOVIE_FIELDS_SHOW = %w(id title overview release_date inventory available_inventory).sort + it 'retrieves info on one movie' do + movie = Movie.first + get movie_path(movie) + + body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal MOVIE_FIELDS_SHOW + end + + it 'returns a 404 error if requesting a movie that does not exist' do + movie = Movie.first + movie.destroy + + get movie_path(movie) + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body).must_include 'errors' + end + end + + describe "create" do + let(:movie_data) { + { + title: 'good new movie', + inventory: 3, + release_date: '1983-09-09' + } + } + + it "creates a movie with valid data" do + + before_count = Movie.count + + + post movies_path, params: movie_data + body = check_response(expected_type: Hash, expected_status: :ok) + + expect(Movie.count).must_equal (before_count+1) + expect(Movie.last.title).must_equal 'good new movie' + end + + + it "returns an error for invalid movie data" do + # arrange + movie_data[:title] = nil + + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body).must_include 'errors' + 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..afacbf382 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,83 @@ +require "test_helper" +require 'pry' + +describe RentalsController do + describe "rentals checkout" do + let(:rental_data) { + { + movie_id: Movie.last.id, + customer_id: Customer.first.id, + } + } + it "must successfully add a new rental when given valid data" do + post checkout_path, params: rental_data + expect(Rental.count).must_equal 3 + must_respond_with :success + expect(Movie.first.available_inventory).must_equal 0 + expect(Rental.last.checkedout).must_equal true + expect(Customer.first.movies_checked_out_count).must_equal 1 + end + + + it "returns an error for invalid rental data" do + expect{ + post checkout_path, params: { movie_id: nil, customer_id: Customer.first.id } + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + + must_respond_with :bad_request + end + + it "returns an unavailable error message if available inventory is 0" do + movie = Movie.first + movie.update(available_inventory: 0) + expect{ + post checkout_path, params: { movie_id: Movie.first.id, customer_id: Customer.first.id } + }.wont_change "Rental.count" + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + + must_respond_with :success + end + end + + describe "rentals check_in" do + let(:rental_data) { + { + movie_id: Movie.last.id, + customer_id: Customer.first.id, + } + } + it "successfully changes checked_out status to false" do + post checkout_path, params: rental_data + expect { + post checkin_path, params: rental_data }.wont_change "Rental.count" + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + expect(Rental.last.checkedout).must_equal false + expect(Customer.first.movies_checked_out_count).must_equal 0 + must_respond_with :success + end + + it "successfully adds movie back to available inventory" do + post checkout_path, params: rental_data + expect{post checkin_path, params: rental_data}.must_change "Movie.last.available_inventory", +1 + end + + it "returns not found if trying to check in a movie without a valid customer or movie id" do + + post checkin_path, params: { movie_id: nil, customer_id: Customer.first.id } + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + 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..16fe769f9 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +customer1: + name: Amy Smith + registered_at: 2018-11-05 13:41:55 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +customer2: + name: Michael Maestro + registered_at: 2018-11-05 13:41:55 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString 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..5538f7a38 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,20 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: GreatMovie + overview: A really great movie + release_date: 2018-11-05 + inventory: 10 + available_inventory: 10 + +two: + title: Second Movie + overview: Better Movie + release_date: 2018-11-15 + inventory: 1 + +movie1: + title: Something Scary + overview: Cool for Halloween + release_date: 1962-10-13 + inventory: 3 \ No newline at end of file diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..f90f63a7b --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +rental1: + check_out: 2018-11-10 + due_date: 2018-11-17 + movie: movie1 + customer: customer1 + checkedout: true + +rental2: + check_out: 2018-11-12 + due_date: 2018-11-19 + movie: movie2 + customer: customer2 + checkedout: true 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..9a2dbb5ef --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end + + describe "relations" do + it "has a list of rentals" do + customer = customers(:customer1) + customer.must_respond_to :rentals + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..615b97417 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,199 @@ +require "test_helper" + +describe Movie do + let(:movie) {movies(:movie1)} + + describe "relations" do + it "has a list of rentals" do + movie.must_respond_to :rentals + movie.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + end + + describe "validations" do + + # -- title -- # + it "requires a title" do + movie.valid?.must_equal true + + movie.title = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :title + end + + it "requires unique titles within release dates" do + movie.valid?.must_equal true + + title = movie.title + release_date = movie.release_date + + movie2 = Movie.new(title: title, release_date: release_date) + movie2.save + + movie2.valid?.must_equal false + movie2.errors.messages.must_include :title + end + + it "does not require a unique title if the release date is different" do + title = movie.title + + movie2 = Movie.new(title: title, release_date: '1977-11-08') + movie2.save + movie2.valid?.must_equal true + end + + # -- inventory -- # + + it 'approves a non-negative inventory int value' do + movie.inventory = 1 + movie.valid?.must_equal true + + movie.inventory = 0 + movie.valid?.must_equal true + end + + it "requires an inventory" do + movie.release_date = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :release_date + end + + it 'will not save a non-negative inventory int value' do + + movie.inventory = -1 + movie.valid?.must_equal false + + movie.inventory = 1.5 + movie.valid?.must_equal false + + movie.inventory = 'a' + movie.valid?.must_equal false + end + + # -- available_inventory -- # + + it 'approves a non-negative available_inventory int value' do + movie.available_inventory = 1 + movie.valid?.must_equal true + + movie.available_inventory = 0 + movie.valid?.must_equal true + end + + it 'requires a non-negative available_inventory int value' do + movie.available_inventory = -1 + movie.valid?.must_equal false + + movie.available_inventory = 1.5 + movie.valid?.must_equal false + + movie.available_inventory = 'a' + movie.valid?.must_equal false + end + + # -- release_date -- # + + it "requires a release date" do + movie.release_date = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :release_date + end + + it "will not accept invalid release dates" do + movie.release_date = '2003' + movie.valid?.must_equal false + movie.errors.messages.must_include :release_date + end + end + + # -- custom model methods -- # + describe 'calculate_checked_out_rentals' do + let(:rental_checked_out) {Rental.new({ + checkedout: true, + movie: movie, + customer: customers(:customer1) + } + ) +} + +it 'correctly calculates checked out rentals' do + rented_inventory = movie.rentals.count { |rental| rental.checked_out? } + + calculation = movie.calculate_checked_out_rentals + + expect(calculation).must_equal rented_inventory +end + +it 'ignores checked in rental entries' do + rental_checked_in = Rental.new({ + checkedout: false, + movie: movie, + customer: customers(:customer2) + } +) + +all_rentals = movie.rentals.length +checked_in_rentals = movie.rentals.count { |rental| !rental.checked_out? } +checked_out_rentals = all_rentals - checked_in_rentals + +calculation = movie.calculate_checked_out_rentals + +expect(calculation).must_equal checked_out_rentals + +end +end + +describe 'calculate_available_inventory' do + + it 'correctly calculates available inventory with valid value' do + total_inventory = movie.inventory + rented_inventory = movie.calculate_checked_out_rentals() + + available_inventory = total_inventory - rented_inventory + + calculation = movie.calculate_available_inventory + + expect(calculation).must_equal available_inventory + end + # + it 'correctly calculates available inventory when value is zero' do + rented_inventory = movie.calculate_checked_out_rentals() + + movie.inventory = rented_inventory + total_inventory = movie.inventory + + available_inventory = total_inventory - rented_inventory + + calculation = movie.calculate_available_inventory + + expect(calculation).must_equal 0 + expect(calculation).must_equal available_inventory + end + + # QUESION: improve error handling here? + it 'throws an error if available_inventory falls below zero' do + movie.inventory = 0 + calculation = movie.calculate_available_inventory + + expect(calculation).must_equal 0 + end +end + +describe 'save_available_inventory' do + it 'can successfully save newly-assigned inventory value' do + result = movie.save_available_inventory(0) + expect(result).must_equal true + + result = movie.save_available_inventory(10) + expect(result).must_equal true + end + + it 'throws an error if save is unsuccessful' do + expect { movie.save_available_inventory(-1) }.must_raise StandardError + end + + +end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..f562c566d --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,24 @@ +require "test_helper" + +describe Rental do + let(:rental) {rentals(:rental1)} + + it "must be valid" do + expect(rental.valid?).must_equal true + end + + + # -- custom model methods -- # + describe 'checked_out?' do + it 'correctly returns whether rental is currently checked out' do + rental.checkedout = true + result = rental.checked_out? + expect(result).must_equal true + + rental.checkedout = false + result = rental.checked_out? + expect(result).must_equal false + end + + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..fb7dd505e --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +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! +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