From 90eb69df13bbb4d1cbcdc2a24c1371d3fd78cc22 Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Mon, 7 May 2018 14:17:07 -0700 Subject: [PATCH 01/29] Intial set up --- .gitignore | 16 ++ Gemfile | 50 ++++++ Gemfile.lock | 154 ++++++++++++++++++ Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 35 ++++ bin/spring | 17 ++ bin/update | 29 ++++ config.ru | 5 + config/application.rb | 40 +++++ config/boot.rb | 3 + config/cable.yml | 10 ++ config/database.yml | 85 ++++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 ++++++ config/environments/production.rb | 83 ++++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 56 +++++++ config/routes.rb | 3 + config/secrets.yml | 32 ++++ config/spring.rb | 6 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 26 +++ tmp/.keep | 0 vendor/.keep | 0 53 files changed, 907 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..68ac019ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# 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 + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..78bff8d26 --- /dev/null +++ b/Gemfile @@ -0,0 +1,50 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.6' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# 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 Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# 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..e547d2449 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,154 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.6) + actionpack (= 5.1.6) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.6) + activesupport (= 5.1.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.6) + activesupport (= 5.1.6) + globalid (>= 0.3.6) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) + arel (~> 8.0) + activesupport (5.1.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.23) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.0.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.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.3.1) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.11.4) + rack (2.0.5) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) + bundler (>= 1.3.0) + railties (= 5.1.6) + 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.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.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.1) + 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.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.7) + rails (~> 5.1.6) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.16.1 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +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..104e40c1c --- /dev/null +++ b/bin/setup @@ -0,0 +1,35 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +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..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +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..2fe7718ea --- /dev/null +++ b/config/application.rb @@ -0,0 +1,40 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +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.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # 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..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..ad59bcd88 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: VideoStoreAPI_production 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..abc82221c --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +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. + 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.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # 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 + + + # 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..3bd8115ea --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,83 @@ +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 + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = 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 + + # 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..8e5cbde53 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +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.seconds.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 + 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..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# 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. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..7e6ce5b6f --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: 9f461b292423e091287dcbe03bfdbfac99ef81b4588f9a757251c58d678898b49501ef4ee157c1b13b4e93a875a4c3f7462f7db9c6dfc6e4152ad29af0b1b647 + +test: + secret_key_base: 0ff6ee05cc1b8d588889e4ba62cfc46842bdb957fbf5c86ff14b732848e0c9893a8042292dde7f1451220438427c6dd74a821a7a7a711a5dbcc610cb6d6f6fdc + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /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/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/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +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 From 8ca95395988e7e8e4b6da85c005e58791d4c5b78 Mon Sep 17 00:00:00 2001 From: Aruna Date: Mon, 7 May 2018 14:23:15 -0700 Subject: [PATCH 02/29] created movie model --- app/models/movie.rb | 2 ++ db/migrate/20180507212242_create_movies.rb | 12 ++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/models/movie_test.rb | 9 +++++++++ 4 files changed, 36 insertions(+) create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20180507212242_create_movies.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20180507212242_create_movies.rb b/db/migrate/20180507212242_create_movies.rb new file mode 100644 index 000000000..62885a98f --- /dev/null +++ b/db/migrate/20180507212242_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + 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/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..090b19e62 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2018-05-07 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-05-07 + inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From 60708c8c4ca9ad8e5f5308f8e08516ba773d35c1 Mon Sep 17 00:00:00 2001 From: Aruna Date: Mon, 7 May 2018 14:29:40 -0700 Subject: [PATCH 03/29] created models --- app/models/customer.rb | 2 + app/models/rental.rb | 2 + db/migrate/20180507212447_create_customers.rb | 15 ++++++ db/migrate/20180507212622_create_rentals.rb | 10 ++++ ...add_customer_id_and_movie_id_to_rentals.rb | 5 ++ db/schema.rb | 46 +++++++++++++++++++ test/fixtures/customers.yml | 19 ++++++++ test/fixtures/rentals.yml | 9 ++++ test/models/customer_test.rb | 9 ++++ test/models/rental_test.rb | 9 ++++ 10 files changed, 126 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20180507212447_create_customers.rb create mode 100644 db/migrate/20180507212622_create_rentals.rb create mode 100644 db/migrate/20180507212839_add_customer_id_and_movie_id_to_rentals.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20180507212447_create_customers.rb b/db/migrate/20180507212447_create_customers.rb new file mode 100644 index 000000000..23316d24a --- /dev/null +++ b/db/migrate/20180507212447_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + 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/20180507212622_create_rentals.rb b/db/migrate/20180507212622_create_rentals.rb new file mode 100644 index 000000000..22a40f7b3 --- /dev/null +++ b/db/migrate/20180507212622_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.date :checkout_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/migrate/20180507212839_add_customer_id_and_movie_id_to_rentals.rb b/db/migrate/20180507212839_add_customer_id_and_movie_id_to_rentals.rb new file mode 100644 index 000000000..655a765e6 --- /dev/null +++ b/db/migrate/20180507212839_add_customer_id_and_movie_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCustomerIdAndMovieIdToRentals < ActiveRecord::Migration[5.1] + def change + + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..59239afb8 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,46 @@ +# 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: 20180507212839) 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.date "checkout_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..c9ee4f795 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2018-05-07 14:24:47 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-05-07 14:24:47 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..30583256b --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: 2018-05-07 + due_date: 2018-05-07 + +two: + checkout_date: 2018-05-07 + due_date: 2018-05-07 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 855dace928f7b9104b407fb6f2d850192ef8664a Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Mon, 7 May 2018 14:35:26 -0700 Subject: [PATCH 04/29] Add controllers --- app/controllers/customers_controller.rb | 4 ++++ app/controllers/movies_controller.rb | 10 ++++++++++ config/routes.rb | 8 ++++++++ ...add_customer_id_and_movie_id_to_rentals.rb | 3 ++- test/controllers/customers_controller_test.rb | 9 +++++++++ test/controllers/movies_controller_test.rb | 19 +++++++++++++++++++ 6 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..73302240c --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..b69241e5f --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,10 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..66dcf49e2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,11 @@ Rails.application.routes.draw do + get 'movies/index' + + get 'movies/show' + + get 'movies/create' + + get 'customers/index' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20180507212839_add_customer_id_and_movie_id_to_rentals.rb b/db/migrate/20180507212839_add_customer_id_and_movie_id_to_rentals.rb index 655a765e6..7ea08529d 100644 --- a/db/migrate/20180507212839_add_customer_id_and_movie_id_to_rentals.rb +++ b/db/migrate/20180507212839_add_customer_id_and_movie_id_to_rentals.rb @@ -1,5 +1,6 @@ class AddCustomerIdAndMovieIdToRentals < ActiveRecord::Migration[5.1] def change - + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..c5ec6f20b --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..53607f49d --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + + it "should get create" do + get movies_create_url + value(response).must_be :success? + end + +end From 604e3dfa93c5636198baa33630525e2bf8258a0e Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Mon, 7 May 2018 14:38:23 -0700 Subject: [PATCH 05/29] Add routes --- config/routes.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 66dcf49e2..537b337f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,11 +1,5 @@ Rails.application.routes.draw do - get 'movies/index' - - get 'movies/show' - - get 'movies/create' - - get 'customers/index' - + resources :movies, only: [:index, :show, :create] + resources :customers, only: :index # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From f8ac74d9983d5b095721a2b426f7ac273bfc22e0 Mon Sep 17 00:00:00 2001 From: Aruna Date: Mon, 7 May 2018 15:04:09 -0700 Subject: [PATCH 06/29] adding tests for models --- app/models/customer.rb | 2 ++ test/fixtures/customers.yml | 28 ++++++++++++++-------------- test/fixtures/movies.yml | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..4930a8532 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,4 @@ class Customer < ApplicationRecord + + end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index c9ee4f795..b41d86feb 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +Mary: + name: Mary registered_at: 2018-05-07 14:24:47 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 945 21st + city: Seattle + state: Wa + postal_code: 98073 + phone: 424234123 -two: - name: MyString +Sally: + name: Sally registered_at: 2018-05-07 14:24:47 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 112 22st + city: sammamish + state: Wa + postal_code: 98074 + phone: 421234541 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 090b19e62..96cad9eee 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - overview: MyString + title: star wars + overview: Science fiction release_date: 2018-05-07 - inventory: 1 + inventory: 10 two: - title: MyString - overview: MyString + title: Harry Porter + overview: Fiction release_date: 2018-05-07 - inventory: 1 + inventory: 12 From 3bc954bb80d9ff71fbc428acaca513764ccde356 Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Mon, 7 May 2018 15:05:35 -0700 Subject: [PATCH 07/29] add validations --- app/models/customer.rb | 6 ++++++ app/models/movie.rb | 4 ++++ app/models/rental.rb | 2 ++ 3 files changed, 12 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..f8c748300 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,8 @@ class Customer < ApplicationRecord + has_many :rentals + + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence:true + validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..ebb8183fa 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals + validates :title, presence: true + validates :release_date, presence: true + validates :inventory, presence: true end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..e001ff37c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie end From 083604deecf17ff75454d373d405e24581e6440e Mon Sep 17 00:00:00 2001 From: Aruna Date: Mon, 7 May 2018 15:18:55 -0700 Subject: [PATCH 08/29] added customer model tests --- test/fixtures/customers.yml | 8 ++++---- test/fixtures/rentals.yml | 4 ++++ test/models/customer_test.rb | 16 +++++++++++++++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index b41d86feb..3ed1887a9 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -Mary: - name: Mary +mary: + name: mary registered_at: 2018-05-07 14:24:47 address: 945 21st city: Seattle @@ -9,8 +9,8 @@ Mary: postal_code: 98073 phone: 424234123 -Sally: - name: Sally +sally: + name: sally registered_at: 2018-05-07 14:24:47 address: 112 22st city: sammamish diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 30583256b..9dfdab362 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,7 +3,11 @@ one: checkout_date: 2018-05-07 due_date: 2018-05-07 + customer: mary + movie: one two: checkout_date: 2018-05-07 due_date: 2018-05-07 + customer: mary + movie: one diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..744eb07e1 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,8 +2,22 @@ describe Customer do let(:customer) { Customer.new } + let(:customer) { customers(:Mary)} + + describe "relations" do + it "has a list of rentals" do + mary = customers(:mary) + mary.must_respond_to :rentals + mary.rentals.each do |rental| + mary.must_be_kind_of Rental + end + end + + end it "must be valid" do - value(customer).must_be :valid? + + + end end From 44d02e95b1e52640a6562b0009f3e4a7609ddd07 Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Mon, 7 May 2018 15:21:22 -0700 Subject: [PATCH 09/29] some test --- app/models/movie.rb | 4 ++++ test/models/movie_test.rb | 2 ++ 2 files changed, 6 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index ebb8183fa..102108dac 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,8 @@ class Movie < ApplicationRecord validates :title, presence: true validates :release_date, presence: true validates :inventory, presence: true + + def available_inventory + return self.inventory + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..4c0e199cb 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,6 +2,8 @@ describe Movie do let(:movie) { Movie.new } + let(:movie1) {movies(:one) } + it "must be valid" do value(movie).must_be :valid? From f8c4eecb10e87a74af8b05826932d0fb9c41f366 Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Mon, 7 May 2018 15:31:36 -0700 Subject: [PATCH 10/29] schema error --- db/schema.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/db/schema.rb b/db/schema.rb index 59239afb8..b129d01b5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -41,6 +41,12 @@ t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From 388bf3df3ba1585e0bb9aed62e3310cb54b7e511 Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Mon, 7 May 2018 16:04:51 -0700 Subject: [PATCH 11/29] Add test for movie model --- test/models/movie_test.rb | 57 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 4c0e199cb..525602b19 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -4,8 +4,61 @@ let(:movie) { Movie.new } let(:movie1) {movies(:one) } + describe "relations" do + it "has a list of rentals" do + movie.rentals.each do |rental| + rental.must_be_instance_of Rental + rental.movie.must_be_instance_of Movie + rental.movie.must_equal movie1 + end + end + end + + describe "validations" do + it "has validation for empty parameters" do + movie.valid?.must_equal false + end + + it "has validation for title presence" do + movie1.title = nil + movie1.valid?.must_equal false + movie1.errors.messages.must_include :title + + movie1.title = "" + movie1.valid?.must_equal false + movie1.errors.messages.must_include :title + end + + it "has validation for release date presence" do + movie1.release_date = nil + movie1.valid?.must_equal false + movie1.errors.messages.must_include :release_date + + movie1.release_date = "" + movie1.valid?.must_equal false + movie1.errors.messages.must_include :release_date + end - it "must be valid" do - value(movie).must_be :valid? + it "has validation for inventory presence" do + movie1.inventory = nil + movie1.valid?.must_equal false + movie1.errors.messages.must_include :inventory + + movie1.inventory = "" + movie1.valid?.must_equal false + movie1.errors.messages.must_include :inventory + end + + + it "must be valid" do + movie1.valid?.must_equal true + end end + + describe "methods" do + it "computes available_inventory" do + movie1.available_inventory.must_equal 10 + end + end + end From f27dd84a4a3257ea8dce557e396e49238b0e2f2d Mon Sep 17 00:00:00 2001 From: Aruna Date: Mon, 7 May 2018 16:07:18 -0700 Subject: [PATCH 12/29] customer model tests passing --- test/models/customer_test.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 744eb07e1..a81a834cb 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,14 +2,16 @@ describe Customer do let(:customer) { Customer.new } - let(:customer) { customers(:Mary)} + let(:customer) { customers(:mary)} describe "relations" do it "has a list of rentals" do mary = customers(:mary) - mary.must_respond_to :rentals - mary.rentals.each do |rental| - mary.must_be_kind_of Rental + + customer.rentals.each do |rental| + rental.must_be_kind_of Rental + rental.customer.must_be_instance_of Customer + rental.customer.must_equal mary end end From 8ee1a00d7afb0e3bc040e3a5a9806e1adb8ee6f3 Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Mon, 7 May 2018 16:31:55 -0700 Subject: [PATCH 13/29] Add rental model test --- app/models/rental.rb | 2 ++ test/models/rental_test.rb | 52 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..9ce1bbff6 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,6 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + validates :checkout_date, presence: true + validates :due_date, presence: true end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..b59d9bba9 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,8 +2,56 @@ describe Rental do let(:rental) { Rental.new } + let(:rental1) { rentals(:one) } - it "must be valid" do - value(rental).must_be :valid? + describe "relations" do + it "has a customer" do + rental1.must_respond_to :customer + rental1.customer.must_be_kind_of Customer + rental1.customer.must_equal customers(:mary) + end + it "has a movie" do + rental1.must_respond_to :movie + rental1.movie.must_be_kind_of Movie + rental1.movie.must_equal movies(:one) + end + + it "changes in customer_id and movie_id reflects in customer and movie" do + rental1.customer_id = customers(:sally).id + rental1.customer.must_equal customers(:sally) + + rental1.movie_id = movies(:two).id + rental1.movie.must_equal movies(:two) + end + end + + describe "validations" do + it "has validation for empty parameters" do + rental.valid?.must_equal false + end + + it "has validation for due_date presence" do + rental1.due_date = nil + rental1.valid?.must_equal false + rental1.errors.messages.must_include :due_date + + rental1.due_date = "" + rental1.valid?.must_equal false + rental1.errors.messages.must_include :due_date + end + + it "has validation for checkout_date presence" do + rental1.checkout_date = nil + rental1.valid?.must_equal false + rental1.errors.messages.must_include :checkout_date + + rental1.checkout_date = "" + rental1.valid?.must_equal false + rental1.errors.messages.must_include :checkout_date + end + + it "must be valid" do + rental1.valid?.must_equal true + end end end From ea1454de2dc53734c1a09a203ca0948e9a314202 Mon Sep 17 00:00:00 2001 From: Aruna Date: Mon, 7 May 2018 22:00:42 -0700 Subject: [PATCH 14/29] added customer index method for controller --- app/controllers/customers_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..fdd619596 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,6 @@ class CustomersController < ApplicationController def index + customers = Customer.all + render json: customers.as_json(only:[:id,:name,:registers_at,:postal_code,:phone,:methods=>[:movies_checked_out_count]]) end end From b10195019d14b994b29e70b8311e05a50144802b Mon Sep 17 00:00:00 2001 From: Aruna Date: Mon, 7 May 2018 22:01:26 -0700 Subject: [PATCH 15/29] added methods to model controller --- app/controllers/movies_controller.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b69241e5f..82761907a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,10 +1,27 @@ class MoviesController < ApplicationController def index + movies = Movie.all + render json: movies.as_json(only:[:id,:title,:release_date]) end def show + @movie = Movie.find_by(id: params[:id]) + + if @movie + + render json: @movie.as_json(only:[:title,:overview,:release_date,:inventory,:methods =>[:available_inventory]]),status: :ok + else + render json: {ok: false,errors:"movie not found"}, status: :not_found + end end def create + movie = Movie.create(movies_params) + if movie.valid? + render json: {id: movie.id}, status: :ok +else + render json: {ok: false,errors:movie.errors}, status: :bad_request +end + end end From a35bf240f3a31e49094d1bf58a03795540a0e741 Mon Sep 17 00:00:00 2001 From: Aruna Date: Mon, 7 May 2018 22:20:01 -0700 Subject: [PATCH 16/29] added customer controller test --- app/models/customer.rb | 4 +++ config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 31 +++++++++++++++++-- test/models/customer_test.rb | 28 +++++++++++++++-- 4 files changed, 59 insertions(+), 6 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index f8c748300..fac33ab88 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,4 +5,8 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence:true validates :phone, presence: true + + def movies_checked_out_count + return 0 + end end diff --git a/config/routes.rb b/config/routes.rb index 537b337f5..f34f09fe6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do resources :movies, only: [:index, :show, :create] - resources :customers, only: :index + resources :customers, only: [:index] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5ec6f20b..dae9c8513 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,8 +2,35 @@ describe CustomersController do it "should get index" do - get customers_index_url - value(response).must_be :success? + get customers_url + must_respond_with :success end + it "returns json" do + get customers_url + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + get customers_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_url + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(id name phone postal_code) + get customers_url + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a81a834cb..95839a0b3 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -7,19 +7,41 @@ describe "relations" do it "has a list of rentals" do mary = customers(:mary) - customer.rentals.each do |rental| rental.must_be_kind_of Rental rental.customer.must_be_instance_of Customer rental.customer.must_equal mary end end - end - it "must be valid" do + describe "validations" do + it "must be valid" do + customer.valid?.must_equal true + end + it "must have validation for name" do + customer.name = nil + customer.valid?.must_equal false + customer.errors.messages.must_include :name + end + + it "must have validation for registered date" do + customer.registered_at = nil + customer.valid?.must_equal false + customer.errors.messages.must_include :registered_at + end + it "must have validation for phone" do + customer.phone = nil + customer.valid?.must_equal false + customer.errors.messages.must_include :phone + end end + describe "method" do + it "returns the count of movies checked" do + customer.movies_checked_out_count.must_equal 0 + end + end end From 440d350b595742e07f852b9325137bf1f1c9b3b2 Mon Sep 17 00:00:00 2001 From: Aruna Date: Mon, 7 May 2018 22:47:01 -0700 Subject: [PATCH 17/29] added movie controller tests --- app/controllers/movies_controller.rb | 27 ++++--- test/controllers/movies_controller_test.rb | 94 +++++++++++++++++++--- 2 files changed, 100 insertions(+), 21 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 82761907a..53d0e59af 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,21 +7,26 @@ def index def show @movie = Movie.find_by(id: params[:id]) - if @movie + if @movie - render json: @movie.as_json(only:[:title,:overview,:release_date,:inventory,:methods =>[:available_inventory]]),status: :ok - else - render json: {ok: false,errors:"movie not found"}, status: :not_found - end + render json: @movie.as_json(only:[:title,:overview,:release_date,:inventory,:methods =>[:available_inventory]]),status: :ok + else + render json: {ok: false,errors:"movie not found"}, status: :not_found + end end def create movie = Movie.create(movies_params) - if movie.valid? - render json: {id: movie.id}, status: :ok -else - render json: {ok: false,errors:movie.errors}, status: :bad_request -end + if movie.valid? + render json: {id: movie.id}, status: :ok + else + render json: {ok: false,errors:movie.errors}, status: :bad_request + end + end + + private + def movies_params + return params.require(:movie).permit(:title, :release_date, :overview) + end end -end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..884ca5e60 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,19 +1,93 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? - end + describe "index" do + # These tests are a little verbose - yours do not need to be + # this explicit. + it "is a real working route" do + get movies_url + must_respond_with :success + end + + it "returns json" do + get movies_url + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + get movies_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end - it "should get show" do - get movies_show_url - value(response).must_be :success? + it "returns all of the movies" do + get movies_url + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns pets with exactly the required fields" do + keys = %w(id release_date title) + get movies_url + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end end - it "should get create" do - get movies_create_url - value(response).must_be :success? + describe "show" do + + + it "can get a movie" do + get movie_path(movies(:two).id) + must_respond_with :success + end + + it "returns a 404 for pets that are not found" do + #Arrange + movie = movies(:two) + movie.destroy + #Action + get movie_path(movie.id) + #Assert + must_respond_with :not_found + end end + describe "create" do + let(:movie_data) { + { + release_date: 2018-05-07, + title: "Planet", + overview: "science fiction" + } + } + + it "Creates a new movie" do + proc{ + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count',1 + must_respond_with :success + + end + + it "returns bad request for params data" do + movie_data[:title] = nil + proc{ + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count',0 + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_include "title" + end + + end end From 225ed4f058afff4a9aa88bec3b27dc15b937cf51 Mon Sep 17 00:00:00 2001 From: Aruna Date: Tue, 8 May 2018 11:02:16 -0700 Subject: [PATCH 18/29] tests passing for movie controller --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 8 ++++++-- app/models/movie.rb | 1 + test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 13 +++++++++---- test/models/customer_test.rb | 2 +- 7 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c3ac046f6c51a2cd4bc2df32c603e493458c382e GIT binary patch literal 6148 zcmeH~F^{dt=u>Bl;zddfqZjB=JE!l7EiIwCR znHYd=e=Zwf1hAw#vGy=AV?N-4FWm9?zTD5J+wJN_+D8XGrH`2G=e8gPq<|EV0#ZN< z%t(Pe#+RQndL})J6p#Y*P{6+rh3>4$))}7;h8O|Jf#oo+W0oL`7s#4yovhF-rw7Yc zi!sFO(N31Ut|nV&Z-?dZVR>isDTZdf9afmotOgXMfE1W0u;}^d=l`Dm-~2ymQ7Q$b zz?&&x!|t%#@}=@@{quTWKW5d}jZVhp3{O7+O#CQb(Zjf3d_mS^>tuzdAAyiTK?=N7 FfnTX=61e~X literal 0 HcmV?d00001 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index fdd619596..7878262f5 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only:[:id,:name,:registers_at,:postal_code,:phone,:methods=>[:movies_checked_out_count]]) + render json: customers.as_json(only:[:id,:name,:registered_at,:postal_code,:phone],:methods=>[:movies_checked_out_count]),status: :ok end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 53d0e59af..f575c49f4 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,4 +1,6 @@ class MoviesController < ApplicationController + + def index movies = Movie.all render json: movies.as_json(only:[:id,:title,:release_date]) @@ -9,7 +11,9 @@ def show if @movie - render json: @movie.as_json(only:[:title,:overview,:release_date,:inventory,:methods =>[:available_inventory]]),status: :ok + + render json: @movie.as_json(only:[:title,:overview,:release_date,:inventory],methods: :available_inventory),status: :ok + else render json: {ok: false,errors:"movie not found"}, status: :not_found end @@ -27,6 +31,6 @@ def create private def movies_params - return params.require(:movie).permit(:title, :release_date, :overview) + return params.require(:movie).permit(:title,:overview,:release_date,:inventory) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 102108dac..e745ad82d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,7 @@ class Movie < ApplicationRecord has_many :rentals validates :title, presence: true + validates :overview,presence: true validates :release_date, presence: true validates :inventory, presence: true diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index dae9c8513..e5d9de644 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -26,7 +26,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(id name phone postal_code) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) get customers_url body = JSON.parse(response.body) body.each do |customer| diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 884ca5e60..f379cf383 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -46,7 +46,7 @@ must_respond_with :success end - it "returns a 404 for pets that are not found" do + it "returns a 404 for movies that are not found" do #Arrange movie = movies(:two) movie.destroy @@ -60,15 +60,18 @@ describe "create" do let(:movie_data) { { - release_date: 2018-05-07, + title: "Planet", - overview: "science fiction" + overview: "fiction", + release_date: Date.new(2018-05-07), + inventory: 5 + } } it "Creates a new movie" do proc{ - post movies_path, params: {movie: movie_data} + post movies_path, params:{movie: movie_data} }.must_change 'Movie.count',1 must_respond_with :success @@ -87,6 +90,8 @@ body["ok"].must_equal false body.must_include "errors" body["errors"].must_include "title" + #Movie.find(body["id"]).title.must_equal movie_data[:title] + # end end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 95839a0b3..aa14dcacf 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -26,7 +26,7 @@ customer.valid?.must_equal false customer.errors.messages.must_include :name end - + it "must have validation for registered date" do customer.registered_at = nil customer.valid?.must_equal false From a8b3835d5988e6ebb02ca03fcc3c0de4a15f2516 Mon Sep 17 00:00:00 2001 From: Aruna Date: Tue, 8 May 2018 11:08:40 -0700 Subject: [PATCH 19/29] fixed error in movie controller --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f575c49f4..4c4b40018 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -31,6 +31,6 @@ def create private def movies_params - return params.require(:movie).permit(:title,:overview,:release_date,:inventory) + return params.permit(:title,:overview,:release_date,:inventory) end end From 737df1c5304210658d659975b274283dd91e484c Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Tue, 8 May 2018 15:21:29 -0700 Subject: [PATCH 20/29] fixed typo --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f379cf383..d62e20ab3 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -71,7 +71,7 @@ it "Creates a new movie" do proc{ - post movies_path, params:{movie: movie_data} + post movies_path, params: movie_data }.must_change 'Movie.count',1 must_respond_with :success From 20e80e5f7af44162104ca12a932a382df4264d60 Mon Sep 17 00:00:00 2001 From: Aruna Date: Tue, 8 May 2018 15:29:11 -0700 Subject: [PATCH 21/29] added rental controller --- app/controllers/movies_controller.rb | 1 - app/controllers/rentals_controller.rb | 24 +++++++++++++++++++++ app/models/rental.rb | 1 + config/routes.rb | 3 +++ test/controllers/movies_controller_test.rb | 10 ++++----- test/controllers/rentals_controller_test.rb | 21 ++++++++++++++++++ test/fixtures/rentals.yml | 6 +++--- 7 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4c4b40018..88ea1aed5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -11,7 +11,6 @@ def show if @movie - render json: @movie.as_json(only:[:title,:overview,:release_date,:inventory],methods: :available_inventory),status: :ok else diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..3f7d47826 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,24 @@ +class RentalsController < ApplicationController + + # def check_out + # + # rental = Rental.new(rental_params) + # if rental.save + # + # if @rental + # + # render json: @rental.as_json(rental.customer_id,rental.video_id),status: :ok + # + # else + # render json: {ok: false,errors:"movie not found"}, status: :not_found + # end + # + # end + # + # def check_in + # end + # + # def rentals_params + # return params.permit(:customer_id,:movie_id,:due_date,:checkout_date) + # end +end diff --git a/app/models/rental.rb b/app/models/rental.rb index 9ce1bbff6..6202e6e5f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,4 +3,5 @@ class Rental < ApplicationRecord belongs_to :movie validates :checkout_date, presence: true validates :due_date, presence: true + end diff --git a/config/routes.rb b/config/routes.rb index f34f09fe6..e7f906233 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,8 @@ Rails.application.routes.draw do + + resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f379cf383..30f90beb9 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require 'date' describe MoviesController do describe "index" do @@ -63,7 +64,7 @@ title: "Planet", overview: "fiction", - release_date: Date.new(2018-05-07), + release_date:"2018-05-07", inventory: 5 } @@ -71,7 +72,7 @@ it "Creates a new movie" do proc{ - post movies_path, params:{movie: movie_data} + post movies_path, params: movie_data }.must_change 'Movie.count',1 must_respond_with :success @@ -80,7 +81,7 @@ it "returns bad request for params data" do movie_data[:title] = nil proc{ - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change 'Movie.count',0 must_respond_with :bad_request @@ -90,8 +91,7 @@ body["ok"].must_equal false body.must_include "errors" body["errors"].must_include "title" - #Movie.find(body["id"]).title.must_equal movie_data[:title] - # 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..b1105f2a5 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,21 @@ +require "test_helper" + + +# describe RentalsController do +# let(:rental_data) { +# { +# customer_id: 1, +# movie_id: 1 +# +# } +# } +# +# it "Creates a new rental" do +# proc{ +# post rentals_path, params: rental_data +# }.must_change 'Rental.count',1 +# must_respond_with :success +# +# end +# +# end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 9dfdab362..0ebc02201 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -2,12 +2,12 @@ one: checkout_date: 2018-05-07 - due_date: 2018-05-07 + due_date: 2018-05-14 customer: mary movie: one two: checkout_date: 2018-05-07 - due_date: 2018-05-07 + due_date: 2018-05-14 customer: mary - movie: one + movie: two From 9836438feadeaabe8d3e9b4520833a4951db3e5b Mon Sep 17 00:00:00 2001 From: Aruna Date: Tue, 8 May 2018 15:41:16 -0700 Subject: [PATCH 22/29] fixed error in movie test --- app/models/movie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index e745ad82d..9c3653115 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord - has_many :rentals + has_many :rentals,dependent: :destroy validates :title, presence: true validates :overview,presence: true validates :release_date, presence: true From 0a361f1a5fa920b45b0599032707cc73b6f913b4 Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Wed, 9 May 2018 09:37:29 -0700 Subject: [PATCH 23/29] add routes --- config/routes.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index e7f906233..5ab4ec5ad 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,10 @@ resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] - + + post 'rentals/check-out', to: 'rentals#check_out', as: 'checkout' + + post 'rentals/check-in', to: 'rentals#check_in', as: 'checkin' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From b9eb68a20434d1169680abd2be5d4f1b74ae203b Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Wed, 9 May 2018 09:41:27 -0700 Subject: [PATCH 24/29] change method logic --- app/models/customer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index fac33ab88..8c582de67 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -7,6 +7,6 @@ class Customer < ApplicationRecord validates :phone, presence: true def movies_checked_out_count - return 0 + self.rentals.count end end From a475d48d8dc1636fc11c03e1338a846cbc82cc02 Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Wed, 9 May 2018 09:42:08 -0700 Subject: [PATCH 25/29] Changed fixtures --- test/fixtures/customers.yml | 9 +++++++++ test/fixtures/movies.yml | 8 +++++++- test/fixtures/rentals.yml | 6 ++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 3ed1887a9..363b86871 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -17,3 +17,12 @@ sally: state: Wa postal_code: 98074 phone: 421234541 + +cherry: + name: cherry + registered_at: 2018-05-07 14:24:47 + address: 112 22st + city: sammamish + state: Wa + postal_code: 98074 + phone: 421234541 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 96cad9eee..04fc7c650 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -10,4 +10,10 @@ two: title: Harry Porter overview: Fiction release_date: 2018-05-07 - inventory: 12 + inventory: 1 + +three: + title: Avengers + overview: Fiction + release_date: 2018-05-07 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 0ebc02201..bb67e75a6 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -11,3 +11,9 @@ two: due_date: 2018-05-14 customer: mary movie: two + +three: + checkout_date: 2018-05-07 + due_date: 2018-05-14 + customer: cherry + movie: three From dc73a4fef823d76ee08438d7df95aa031ecb74af Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Wed, 9 May 2018 09:43:01 -0700 Subject: [PATCH 26/29] Add tests --- test/controllers/rentals_controller_test.rb | 141 +++++++++++++++++--- 1 file changed, 123 insertions(+), 18 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b1105f2a5..8a10946d4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,21 +1,126 @@ require "test_helper" -# describe RentalsController do -# let(:rental_data) { -# { -# customer_id: 1, -# movie_id: 1 -# -# } -# } -# -# it "Creates a new rental" do -# proc{ -# post rentals_path, params: rental_data -# }.must_change 'Rental.count',1 -# must_respond_with :success -# -# end -# -# end +describe RentalsController do + let(:mary) { customers(:mary) } + let(:cherry) { customers(:cherry) } + let(:one) { movies(:one) } + let(:three) { movies(:three) } + + + describe "Check Out" do + it "can check-out a movie" do + proc { + post checkout_path params: {customer_id: mary.id, movie_id: one.id} + }.must_change "Rental.count", 1 + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "customer_id" + body.must_include "movie_id" + body.must_include "due_date" + end + + it "increases checkout count" do + start = mary.movies_checked_out_count + post checkout_path params: {customer_id: mary.id, movie_id: one.id} + mary.movies_checked_out_count.must_equal start + 1 + end + + it "decreases available inventory" do + start = one.available_inventory + post checkout_path params: {customer_id: mary.id, movie_id: one.id} + one.reload + one.available_inventory.must_equal start - 1 + end + + it "won't check-out a movie with bogus customer data" do + proc { + post checkout_path params: {customer_id: 0, movie_id: one.id } + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + end + + it "won't check-out a movie with bogus movie data" do + one.destroy + proc { + post checkout_path params: {customer_id: mary.id, movie_id: movies(:one).id} + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + end + + it "won't create a rental if the available inventory is zero" do + post checkout_path params: {customer_id: mary.id, movie_id: movies(:two).id} + + post checkout_path params: {customer_id: customers(:mary).id, movie_id: movies(:two).id} + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + end + + it "won't change available inventory or customer checkout count if rental is bogus" do + start = cherry.movies_checked_out_count + one.destroy + post checkout_path params: {customer_id: cherry.id, movie_id: movies(:one).id } + cherry.reload + cherry.movies_checked_out_count.must_equal start + end + end + + describe "Check In" do + it "can check in a movie" do + post checkin_path params: {customer_id: mary.id, movie_id: movies(:one).id} + + must_respond_with :success + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "customer_id" + body.must_include "movie_id" + + end + + it "won't check in a bad rental request" do + one.destroy + post checkin_path params: {customer_id: mary.id, movie_id: movies(:one).id} + + must_respond_with :not_found + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + end + + it "will update the customers checked out count" do + start = mary.movies_checked_out_count + + post checkin_path params: {customer_id: mary.id, movie_id: movies(:one).id} + mary.movies_checked_out_count.must_equal start - 1 + end + + it "will update the movie's available_inventory" do + start = one.available_inventory + + post checkin_path params: {customer_id: mary.id, movie_id: movies(:one).id} + one.reload + one.available_inventory.must_equal start + 1 + end + + it "won't updated customers or movies if the rental is a bad request" do + one.destroy + post checkin_path params: {customer_id: customers(:mary).id, movie_id: movies(:one).id} + must_respond_with :not_found + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + end + end +end From 16226a4680d07fdf405f7e8d18571edf990f5e96 Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Wed, 9 May 2018 09:43:56 -0700 Subject: [PATCH 27/29] wrote methods --- app/controllers/movies_controller.rb | 8 ++-- app/controllers/rentals_controller.rb | 66 ++++++++++++++++++--------- 2 files changed, 49 insertions(+), 25 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 88ea1aed5..5411b48fb 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -27,9 +27,9 @@ def create end end - private + private - def movies_params - return params.permit(:title,:overview,:release_date,:inventory) - end + def movies_params + return params.permit(:title, :overview, :release_date, :inventory) end +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3f7d47826..90b2e2d30 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,24 +1,48 @@ class RentalsController < ApplicationController - # def check_out - # - # rental = Rental.new(rental_params) - # if rental.save - # - # if @rental - # - # render json: @rental.as_json(rental.customer_id,rental.video_id),status: :ok - # - # else - # render json: {ok: false,errors:"movie not found"}, status: :not_found - # end - # - # end - # - # def check_in - # end - # - # def rentals_params - # return params.permit(:customer_id,:movie_id,:due_date,:checkout_date) - # end + def check_out + customer = Customer.find_by(id: params[:customer_id]) + if customer.nil? + render json: { ok: false, errors: "invalid customer id"}, status: :not_found + return + end + movie = Movie.find_by(id: params[:movie_id]) + if movie.nil? + render json: { ok: false, errors: "invalid movid id"}, status: :not_found + return + end + if movie.available_inventory < 1 + render json: { ok: false, errors: "movie not in inventory"}, status: :not_found + return + end + rental = Rental.new(rental_params) + rental.checkout_date = Date.today + rental.due_date = Date.today + 7 + movie.inventory -= 1 + if rental.save && movie.save + render json: rental.as_json(only: [:customer_id, :movie_id, :due_date]), status: :ok + else + render json: {ok: false, errors: "could not rent"}, status: :not_found + end + end + + def check_in + rental = Rental.where(customer_id: params[:customer_id], movie_id: params[:movie_id])[0] + if rental.nil? + render json: {errors: "rental not found" }, status: :not_found + else + rental.movie.inventory += 1 + unless rental.customer.save && rental.movie.save + render json: {errors: {customer: customer.errors.messages, movie: movie.errors.messages} }, status: :bad_request + end + render json: rental.as_json(only: [:customer_id, :movie_id]) + rental.destroy + end + end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end end From f00ba737a52e19d45c2b8ed455d7e34a77da65df Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Wed, 9 May 2018 09:44:30 -0700 Subject: [PATCH 28/29] fix failure --- test/models/customer_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index aa14dcacf..d220cdc46 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -41,7 +41,7 @@ end describe "method" do it "returns the count of movies checked" do - customer.movies_checked_out_count.must_equal 0 + customer.movies_checked_out_count.must_equal 2 end end end From 0c336cddfd4bea3676e25b18c6a22e519d72ad1a Mon Sep 17 00:00:00 2001 From: Monalisa Chatterjee Date: Wed, 9 May 2018 10:36:21 -0700 Subject: [PATCH 29/29] add erd --- VideoStoreApi.pdf | Bin 0 -> 10913 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 VideoStoreApi.pdf diff --git a/VideoStoreApi.pdf b/VideoStoreApi.pdf new file mode 100644 index 0000000000000000000000000000000000000000..128660daa436730c8904110682e6195e78977c27 GIT binary patch literal 10913 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 e{!^v