From 162c58d33e306d03ac40110505c89468a43e1de3 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Mon, 6 Nov 2017 14:05:51 -0800 Subject: [PATCH 01/30] Add customer and movie model and seed db --- .gitignore | 16 ++ Gemfile | 53 ++++++ Gemfile.lock | 170 ++++++++++++++++++ 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/models/customer.rb | 2 + app/models/movie.rb | 2 + 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 + db/migrate/20171106215600_create_movies.rb | 12 ++ db/migrate/20171106215714_create_customers.rb | 15 ++ db/migrate/20171106215930_add.rb | 5 + db/schema.rb | 40 +++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/customers.yml | 19 ++ test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 13 ++ test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 9 + test/models/movie_test.rb | 9 + test/test_helper.rb | 17 ++ tmp/.keep | 0 vendor/.keep | 0 63 files changed, 1043 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/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 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 db/migrate/20171106215600_create_movies.rb create mode 100644 db/migrate/20171106215714_create_customers.rb create mode 100644 db/migrate/20171106215930_add.rb create mode 100644 db/schema.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/customers.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/movies.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb 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..4ae55c93d --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +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.4' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# 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', '~> 3.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] + +gem 'jquery-turbolinks' +group :development do + gem 'better_errors' + gem 'pry-rails' + gem 'binding_of_caller' +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..484707437 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,170 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.4) + actionpack (= 5.1.4) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.4) + activesupport (= 5.1.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.4) + activesupport (= 5.1.4) + globalid (>= 0.3.6) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) + arel (~> 8.0) + activesupport (5.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + better_errors (2.4.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + binding_of_caller (0.7.3) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.1.0) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.2) + debug_inspector (0.0.3) + erubi (1.7.0) + ffi (1.9.18) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.1.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (0.1.4) + mini_portile2 (2.3.0) + minitest (5.10.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.18) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + pg (0.21.0) + pry (0.11.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.10.0) + rack (2.0.3) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.2.1) + rb-fsevent (0.10.2) + 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) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.4) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.7) + rails (~> 5.1.4) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.15.4 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/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/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/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..7d3c866ff --- /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..604c49031 --- /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: 66c54d74a72d694887663c5e95af35d23d60f292ee4ba36bb5830c13ff87ffeba58edc9bacabe61afbfd180292cb40dcea57688cd11f0bb623b74d534a1fc761 + +test: + secret_key_base: f0462dd7a1d245a4ef6842d3e7b6b5c4cf0768ed83010153832a64578c2fed4d1c1646f93b6986e35f7f54a8838017bece4354afa34b8d6df863841063d33c0a + +# 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/db/migrate/20171106215600_create_movies.rb b/db/migrate/20171106215600_create_movies.rb new file mode 100644 index 000000000..84782a1b7 --- /dev/null +++ b/db/migrate/20171106215600_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.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20171106215714_create_customers.rb b/db/migrate/20171106215714_create_customers.rb new file mode 100644 index 000000000..0a05c4bad --- /dev/null +++ b/db/migrate/20171106215714_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.string :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/20171106215930_add.rb b/db/migrate/20171106215930_add.rb new file mode 100644 index 000000000..5eca8d1f6 --- /dev/null +++ b/db/migrate/20171106215930_add.rb @@ -0,0 +1,5 @@ +class Add < ActiveRecord::Migration[5.1] + def change + add_column :customers, :account_credit, :float + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..028a5f1b8 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,40 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# 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: 20171106215930) 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.string "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.float "account_credit" + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/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/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..bf442fa90 --- /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: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d774de5f1 --- /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: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..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/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 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..7c0fbfd6f --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,17 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" + +# 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 6e907c739a7d61749c13c5dc72d24008264c8397 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Mon, 6 Nov 2017 14:07:59 -0800 Subject: [PATCH 02/30] Add relationships to models --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..9bf7e317c 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :movies end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..866cedd89 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + belongs_to :customer end From 44f395b8a1fc7739addf4f7153b98c5955ad220f Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Mon, 6 Nov 2017 14:28:40 -0800 Subject: [PATCH 03/30] Add yml data --- config/routes.rb | 3 +++ test/fixtures/customers.yml | 30 ++++++++++++++++-------------- test/fixtures/movies.yml | 16 ++++++++-------- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..c871f767f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :movies, only:[:index, :show, :create, :update] + resources :customers, only:[:index, :show, :create, :update] + end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index bf442fa90..022f00d77 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,21 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString - registered_at: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: Curran Stout + registered_at: Wed, 16 Apr 2014 21:40:20 -0700 + address: Ap 658-1540 Erat Rd. + city: San Francisco + state: California + postal_code: 94267 + phone: (908) 949-6758 + account_credit: 35.66 two: - name: MyString - registered_at: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: Shelley Rocha + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: Ap 292-5216 Ipsum Rd + city: Hillsboro + state: OR + postal_code: 24309 + phone: (322) 510-8695 + account_credit: 13.15 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..7730eeb13 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 - release_date: MyString - inventory: 1 + title: Psycho + overview: A movie description of a horror movie + release_date: 1960-06-16 + inventory: 8 two: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 + title: Jaws + overview: An insatiable great white shark terrorizes the townspeople of Amity Island + release_date: 1975-06-19 + inventory: 6 From a9de2e78b5fbf9633eb6eda96a6d3d5869e2dc8f Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Mon, 6 Nov 2017 14:52:15 -0800 Subject: [PATCH 04/30] Add models and add controller methods --- app/controllers/customer_controller.rb | 17 +++++++++++++++++ app/controllers/movie_controller.rb | 17 +++++++++++++++++ test/controllers/customer_controller_test.rb | 7 +++++++ test/controllers/movie_controller_test.rb | 7 +++++++ test/fixtures/movies.yml | 4 ++-- test/models/customer_test.rb | 6 +++--- test/models/movie_test.rb | 5 ----- 7 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 app/controllers/customer_controller.rb create mode 100644 app/controllers/movie_controller.rb create mode 100644 test/controllers/customer_controller_test.rb create mode 100644 test/controllers/movie_controller_test.rb diff --git a/app/controllers/customer_controller.rb b/app/controllers/customer_controller.rb new file mode 100644 index 000000000..a22a25588 --- /dev/null +++ b/app/controllers/customer_controller.rb @@ -0,0 +1,17 @@ +class CustomerController < ApplicationController + def index + customers = Customer.all + render( + json: customers.as_json(only: [:name, :address, :registered_at, :city, :state, :postal_code, :phone, :account_credit]), status: :ok + ) + end + + def show + end + + def create + end + + def update + end +end diff --git a/app/controllers/movie_controller.rb b/app/controllers/movie_controller.rb new file mode 100644 index 000000000..4c538e31e --- /dev/null +++ b/app/controllers/movie_controller.rb @@ -0,0 +1,17 @@ +class MovieController < ApplicationController + def index + movies = Movie.all + render( + json: movies.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + ) + end + + def show + end + + def create + end + + def update + end +end diff --git a/test/controllers/customer_controller_test.rb b/test/controllers/customer_controller_test.rb new file mode 100644 index 000000000..4a4cc1b24 --- /dev/null +++ b/test/controllers/customer_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomerController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movie_controller_test.rb b/test/controllers/movie_controller_test.rb new file mode 100644 index 000000000..111228a58 --- /dev/null +++ b/test/controllers/movie_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MovieController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 7730eeb13..efec4dd1f 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,12 +1,12 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +psycho: title: Psycho overview: A movie description of a horror movie release_date: 1960-06-16 inventory: 8 -two: +jaws: title: Jaws overview: An insatiable great white shark terrorizes the townspeople of Amity Island release_date: 1975-06-19 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..efcf3dabd 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,9 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:one) } + + describe "relations" do - it "must be valid" do - value(customer).must_be :valid? end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..2719f5fff 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,4 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } - - it "must be valid" do - value(movie).must_be :valid? - end end From 55103339207f89b3130b6e99e6d8a60b2c27324c Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Mon, 6 Nov 2017 15:03:38 -0800 Subject: [PATCH 05/30] Add controller testing --- Gemfile | 1 + ...omer_controller.rb => customers_controller.rb} | 2 +- .../{movie_controller.rb => movies_controller.rb} | 2 +- test/controllers/customer_controller_test.rb | 7 ------- test/controllers/customers_controller_test.rb | 15 +++++++++++++++ ...ntroller_test.rb => movies_controller_test.rb} | 2 +- 6 files changed, 19 insertions(+), 10 deletions(-) rename app/controllers/{customer_controller.rb => customers_controller.rb} (84%) rename app/controllers/{movie_controller.rb => movies_controller.rb} (82%) delete mode 100644 test/controllers/customer_controller_test.rb create mode 100644 test/controllers/customers_controller_test.rb rename test/controllers/{movie_controller_test.rb => movies_controller_test.rb} (76%) diff --git a/Gemfile b/Gemfile index 4ae55c93d..a6e0bdd54 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,7 @@ gem 'puma', '~> 3.7' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] + gem 'pry-rails' end group :development do diff --git a/app/controllers/customer_controller.rb b/app/controllers/customers_controller.rb similarity index 84% rename from app/controllers/customer_controller.rb rename to app/controllers/customers_controller.rb index a22a25588..df1910a2b 100644 --- a/app/controllers/customer_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,4 @@ -class CustomerController < ApplicationController +class CustomersController < ApplicationController def index customers = Customer.all render( diff --git a/app/controllers/movie_controller.rb b/app/controllers/movies_controller.rb similarity index 82% rename from app/controllers/movie_controller.rb rename to app/controllers/movies_controller.rb index 4c538e31e..2f54f6dcf 100644 --- a/app/controllers/movie_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,4 +1,4 @@ -class MovieController < ApplicationController +class MoviesController < ApplicationController def index movies = Movie.all render( diff --git a/test/controllers/customer_controller_test.rb b/test/controllers/customer_controller_test.rb deleted file mode 100644 index 4a4cc1b24..000000000 --- a/test/controllers/customer_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require "test_helper" - -describe CustomerController do - # it "must be a real test" do - # flunk "Need real tests" - # end -end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..b9bb7a788 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,15 @@ +require "test_helper" + +describe CustomersController do + describe "index" do + it "is a working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + response.header['Content-Type'].must_include 'json' + end + end +end diff --git a/test/controllers/movie_controller_test.rb b/test/controllers/movies_controller_test.rb similarity index 76% rename from test/controllers/movie_controller_test.rb rename to test/controllers/movies_controller_test.rb index 111228a58..67fabbcfb 100644 --- a/test/controllers/movie_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -describe MovieController do +describe MoviesController do # it "must be a real test" do # flunk "Need real tests" # end From a83fcf8060c379505819890e848c400191ba1cad Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Mon, 6 Nov 2017 15:45:12 -0800 Subject: [PATCH 06/30] Add tests for index --- app/controllers/customers_controller.rb | 22 +++++++------ app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- test/controllers/customers_controller_test.rb | 31 +++++++++++++++++++ 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index df1910a2b..c090a213b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,17 +1,21 @@ class CustomersController < ApplicationController def index customers = Customer.all + # render( + # json: customers.as_json(only: [:name, :address, :registered_at, :city, :state, :postal_code, :phone, :account_credit]), status: :ok + # ) render( - json: customers.as_json(only: [:name, :address, :registered_at, :city, :state, :postal_code, :phone, :account_credit]), status: :ok + json: customers.as_json(except: [:created_at, :updated_at]), + status: :ok ) end - def show - end - - def create - end - - def update - end + # def show + # end + # + # def create + # end + # + # def update + # end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 9bf7e317c..fb915674c 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,3 @@ class Customer < ApplicationRecord - has_many :movies + # has_many :movies end diff --git a/app/models/movie.rb b/app/models/movie.rb index 866cedd89..074012735 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,3 @@ class Movie < ApplicationRecord - belongs_to :customer + # belongs_to :customer end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b9bb7a788..74d6ad9d0 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -11,5 +11,36 @@ get customers_path response.header['Content-Type'].must_include 'json' end + + it "returns an array" do + get customers_path + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns the customers with exactly the required fields" do + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal ["account_credit", "address", "city", "id", "name", "phone", "postal_code", "registered_at", "state"] + end + end + + it "returns an empty array if there are no customers" do + Customer.destroy_all + get customers_path + must_respond_with :success + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.must_be :empty? + end + + end end From 984f0aece48fd6ac9d9156e03b57f3b6b485769b Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Mon, 6 Nov 2017 15:47:57 -0800 Subject: [PATCH 07/30] Add show method --- app/controllers/customers_controller.rb | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c090a213b..59898a892 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,17 +1,26 @@ class CustomersController < ApplicationController def index customers = Customer.all - # render( - # json: customers.as_json(only: [:name, :address, :registered_at, :city, :state, :postal_code, :phone, :account_credit]), status: :ok - # ) + render( json: customers.as_json(except: [:created_at, :updated_at]), status: :ok ) end - # def show - # end + def show + customer = Customer.find_by(id: params[:id]) + if customer + render( + json: customer.as_json(except: [:created_at, :updated_at]), + status: :ok + ) + else + render( + json: {nothing: true}, status: :not_found + ) + end + end # # def create # end From 056315101a31429d1eed201dc60ae70f68108260 Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Mon, 6 Nov 2017 15:51:25 -0800 Subject: [PATCH 08/30] Add tests for show --- test/controllers/customers_controller_test.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 74d6ad9d0..1f5a13456 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -40,7 +40,21 @@ body.must_be_kind_of Array body.must_be :empty? end + end + + describe "show" do + it "returns a customer" do + get customer_path(customers(:one).id) + must_respond_with :success + end + it "returns not_found when customer is not found" do + invalid_customer_id = Customer.last.id + 1 + get customer_path(invalid_customer_id) + must_respond_with :not_found + body = JSON.parse(response.body) + body.must_equal "nothing" => true + end end end From 0bcaaa96534536c8d165c93618a2780148a0bce7 Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Mon, 6 Nov 2017 15:56:03 -0800 Subject: [PATCH 09/30] Add create method --- app/controllers/customers_controller.rb | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 59898a892..c9f186016 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -21,10 +21,27 @@ def show ) end end - # - # def create - # end + + def create + customer = Customer.new(customer_params) + + if customer.save + render( + json: {id: customer.id}, status: :ok + ) + else + render( + json: {errors: customer.errors.messages}, status: :bad_request + ) + end + end # # def update # end + + private + + def customer_params + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit) + end end From 011eee95380dd0c270c6e13f0f242463c5e72fb6 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Mon, 6 Nov 2017 15:56:29 -0800 Subject: [PATCH 10/30] Add testing to the movie controller index, show, create --- app/controllers/movies_controller.rb | 24 ++++++ app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- test/controllers/movies_controller_test.rb | 90 +++++++++++++++++++++- 4 files changed, 113 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2f54f6dcf..26fe3c79c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,11 +7,35 @@ def index end def show + movie = Movie.find_by(id: params[:id]) + if movie + render( + json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + ) + else + render( + json: { "nothing" => true}, status: :not_found + ) + end end def create + movie = Movie.new(movies_params) + if movie.save! + # This is returning the new movie id as a json back to the user + render json: { id: movie.id }, status: :ok + else + # If there was an error with one of the validations then we are sending back a json hash with the errors as an array? + render json: { errors: movie.errors.messages }, status: :bad_request + end end def update end + + private + + def movies_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 9bf7e317c..fb915674c 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,3 @@ class Customer < ApplicationRecord - has_many :movies + # has_many :movies end diff --git a/app/models/movie.rb b/app/models/movie.rb index 866cedd89..074012735 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,3 @@ class Movie < ApplicationRecord - belongs_to :customer + # belongs_to :customer end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..288db54d1 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,91 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + let(:movie) { movies(:psycho) } + + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + + it "returns json" do + get movies_path + response.header['Content-Type'].must_include 'json' + end + + it "returns an array" do + get movies_path + # This returns the body of all pets! + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns all movies with the requred fields" do + keys = ["inventory", "overview", "release_date", "title"] + + get movies_path + + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + + it "returns an array if there are no movies" do + Movie.destroy_all + + get movies_path + + body = JSON.parse(response.body) + body.must_be :empty? + end + end + + describe "show" do + it "returns success if a movie is found" do + get movie_path(movie) + + must_respond_with :success + end + + it "returns not found if a movie is not found" do + get movie_path(Movie.last.id + 1) + + must_respond_with :not_found + body = JSON.parse(response.body) + body.must_equal "nothing" => true + end + end + + describe "create" do + let(:movie_data) { + { + title: "Harry Potter", + overview: "A boy who lived with the scar", + release_date: 2001-11-16, + inventory: 3 + } + } + + it "returns success if a movie is created" do + proc { + post movies_path, params: { movie: movie_data } + }.must_change 'Movie.count', 1 + + must_respond_with :success + end + end + + describe "update" do + it "returns sucess if the movie is updated" do + end + end end From f38c9c40315bf117218e116f1c8531c83615798b Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Mon, 6 Nov 2017 16:43:37 -0800 Subject: [PATCH 11/30] Fix controller movie test --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/movies_controller.rb | 7 ++++--- app/models/movie.rb | 4 ++++ test/controllers/movies_controller_test.rb | 17 ++++++++++++++++- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ca5d0e6e71945129431efcf086d0e96e397046d8 GIT binary patch literal 6148 zcmeH~F^f4mh3n7#7gpu zObo#Gk7);t0M>LTwjO3?%m>_Y#trxB_H+5ZUN2sxtvcW-eZ*`(w*@I61*Cu!kOER* zK?>wCzTPb8ne-@9Kng5F0slS}y0a!*XM8#sVgw)umczJ?S%NHHAZxO9vO=?*9xPie z#t^SZJ6ZC&nrxlD9hSp~<(h|QedXQN6$w;|Bv*)=KooXQYjz> z{+R+c98QNlUn Date: Mon, 6 Nov 2017 18:38:56 -0800 Subject: [PATCH 12/30] Add tests for create --- app/controllers/customers_controller.rb | 2 ++ app/models/customer.rb | 7 ++++ test/controllers/customers_controller_test.rb | 33 +++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c9f186016..602a8dd76 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,6 @@ class CustomersController < ApplicationController + # protect_from_forgery with: :null_session + def index customers = Customer.all diff --git a/app/models/customer.rb b/app/models/customer.rb index fb915674c..fda78d0cf 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,10 @@ class Customer < ApplicationRecord # has_many :movies + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 1f5a13456..f173cfa53 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -57,4 +57,37 @@ body.must_equal "nothing" => true end end + + describe "create" do + let(:customer_data) { + { + name: "New Customer", + registered_at: "Date", + address: "Address", + city: "City", + state: "State", + postal_code: "Zip", + phone: "Phone number", + account_credit: "Money" + } + } + it "create a new customer" do + start_count = Customer.count + post customers_path, params: { customer: customer_data } + + must_respond_with :success + Customer.count.must_equal start_count + 1 + end + + it "won't create a new customer if data is missing" do + invalid_customer_data = { + name: "New Customer", + } + start_count = Customer.count + post customers_path, params: { customer: invalid_customer_data } + + must_respond_with :bad_request + Customer.count.must_equal start_count + end + end end From 7df0e976cc8908e17b1fcb1488c4c22f91abcec9 Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Mon, 6 Nov 2017 19:02:02 -0800 Subject: [PATCH 13/30] Add update method --- app/controllers/customers_controller.rb | 26 +++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 602a8dd76..cf493ce5e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -37,13 +37,31 @@ def create ) end end - # - # def update - # end + + def update + customer = Customer.find_by(id: params[:id]) + if customer + customer.update_attributes(customer_params) + if customer.save + render( + json: customer.as_json(except: [:created_at, :updated_at]), + status: :ok + ) + else + render( + json: {errors: customer.errors.messages}, status: :bad_request + ) + end + else + render( + json: {nothing: true}, status: :not_found + ) + end + end private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit) + params.permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit) end end From b116d51a4ffe16dfdefaa538356e53ebcc8ed22e Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Mon, 6 Nov 2017 19:04:10 -0800 Subject: [PATCH 14/30] Remove customer from params and fix the tests --- test/controllers/customers_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index f173cfa53..040cd5d2a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -73,7 +73,7 @@ } it "create a new customer" do start_count = Customer.count - post customers_path, params: { customer: customer_data } + post customers_path, params: customer_data must_respond_with :success Customer.count.must_equal start_count + 1 @@ -84,7 +84,7 @@ name: "New Customer", } start_count = Customer.count - post customers_path, params: { customer: invalid_customer_data } + post customers_path, params: invalid_customer_data must_respond_with :bad_request Customer.count.must_equal start_count From 8d92e23324c65d18c12fcfd242ecffd96ee4740f Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Mon, 6 Nov 2017 19:28:00 -0800 Subject: [PATCH 15/30] Add tests for update, one is failing --- test/controllers/customers_controller_test.rb | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 040cd5d2a..2b5339a13 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -81,7 +81,7 @@ it "won't create a new customer if data is missing" do invalid_customer_data = { - name: "New Customer", + name: "New Customer" } start_count = Customer.count post customers_path, params: invalid_customer_data @@ -90,4 +90,37 @@ Customer.count.must_equal start_count end end + + describe "update" do + let(:customer_data) { + { + name: "Very New Customer" + } + } + it "returns not_found when customer is not found" do + invalid_customer_id = Customer.last.id + 1 + get customer_path(invalid_customer_id) + must_respond_with :not_found + + body = JSON.parse(response.body) + body.must_equal "nothing" => true + end + + it "update customer information" do + customer = customers(:one) + patch customer_path(customer.id), params: customer_data + + must_respond_with :success + # customer.name.must_equal customer_data[:name] + end + + it "won't update customer information if data is missing" do + invalid_customer_data = { + name: "" + } + patch customer_path(customers(:one).id), params: invalid_customer_data + + must_respond_with :bad_request + end + end end From 6225aa1cb879c1bde70dd451b5f3af45fbbd2112 Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Mon, 6 Nov 2017 19:45:17 -0800 Subject: [PATCH 16/30] Add tests for model but one is failing --- app/models/customer.rb | 3 ++- test/models/customer_test.rb | 39 +++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index fda78d0cf..543b6e718 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,6 @@ class Customer < ApplicationRecord - # has_many :movies + has_many :movies + validates :name, presence: true validates :registered_at, presence: true validates :address, presence: true diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index efcf3dabd..e171f1324 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,46 @@ require "test_helper" +# validates :name, presence: true +# validates :registered_at, presence: true +# validates :address, presence: true +# validates :city, presence: true +# validates :state, presence: true +# validates :postal_code, presence: true +# validates :phone, presence: true + describe Customer do let(:customer) { customers(:one) } - + describe "relations" do + it "a customer can have many movies" do + customer.must_respond_to :movies + # customer.movies.each do |movie| + # movie.must_be_kind_of Movie + # end + end + end + + describe "validations" do + it "allows a customer to be created with all required data" do + customer_data = { name: "New Customer", + registered_at: "Date", + address: "Address", + city: "City", + state: "State", + postal_code: "Zip", + phone: "Phone number", + account_credit: "Money" } + customer = Customer.new(customer_data) + + customer.must_be :valid? + end + + it "requires all the data to be created" do + invalid_customer_data = { name: "New Customer", + registered_at: "Date" } + customer = Customer.new(invalid_customer_data) + customer.wont_be :valid? + end end end From 694b51072f8a54cdda639b6b3558472e0a02bccc Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Mon, 6 Nov 2017 22:16:43 -0800 Subject: [PATCH 17/30] Fix movie tests params --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 595f9810e..2ee25567d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -37,6 +37,6 @@ def update private def movies_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 64bd3839e..d3b21fb95 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -85,7 +85,7 @@ it "returns success if a movie is created" do proc { - post movies_path, params: { movie: movie_data } + post movies_path, params: movie_data }.must_change 'Movie.count', 1 response.header['Content-Type'].must_include 'json' @@ -93,14 +93,14 @@ end it "returns bad_request if the movie has invalid parameters" do - proc { post movies_path, params: { movie: invalid_data} }.wont_change 'Movie.count', 1 + proc { post movies_path, params: invalid_data }.wont_change 'Movie.count', 1 must_respond_with :bad_request end end describe "update" do - it "returns sucess if the movie is updated" do + it "returns success if the movie is updated" do end end end From 6185e33316dfba738be19556656137209a5d8fd3 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 7 Nov 2017 09:56:44 -0800 Subject: [PATCH 18/30] Add available inventory column to the movies table --- app/controllers/movies_controller.rb | 2 +- .../20171107173425_add_available_inventory_column.rb | 5 +++++ db/schema.rb | 3 ++- test/controllers/movies_controller_test.rb | 7 ++++--- test/fixtures/movies.yml | 2 ++ 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20171107173425_add_available_inventory_column.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2ee25567d..d11061af7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,7 +3,7 @@ class MoviesController < ApplicationController def index movies = Movie.all render( - json: movies.as_json(only: [:id, :title, :overview, :release_date, :inventory]), status: :ok + json: movies.as_json(only: [:id, :title, :release_date]), status: :ok ) end diff --git a/db/migrate/20171107173425_add_available_inventory_column.rb b/db/migrate/20171107173425_add_available_inventory_column.rb new file mode 100644 index 000000000..629218ee7 --- /dev/null +++ b/db/migrate/20171107173425_add_available_inventory_column.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryColumn < ActiveRecord::Migration[5.1] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 028a5f1b8..78d3d1420 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171106215930) do +ActiveRecord::Schema.define(version: 20171107173425) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d3b21fb95..36040eae5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -28,8 +28,8 @@ body.length.must_equal Movie.count end - it "returns all movies with the requred fields" do - keys = ["id", "inventory", "overview", "release_date", "title"] + it "returns all movies with the required fields" do + keys = ["id", "release_date", "title"] get movies_path @@ -39,13 +39,14 @@ end end - it "returns an array if there are no movies" do + it "returns an empty array if there are no movies" do Movie.destroy_all get movies_path body = JSON.parse(response.body) body.must_be :empty? + must_respond_with :success end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index efec4dd1f..07afe8614 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,9 +5,11 @@ psycho: overview: A movie description of a horror movie release_date: 1960-06-16 inventory: 8 + available_inventory: 8 jaws: title: Jaws overview: An insatiable great white shark terrorizes the townspeople of Amity Island release_date: 1975-06-19 inventory: 6 + available_inventory: 6 From 5c95ff835e05343b0d133e270caa20637b4200db Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Tue, 7 Nov 2017 10:08:30 -0800 Subject: [PATCH 19/30] Remove comments --- .DS_Store | Bin 0 -> 6148 bytes app/models/movie.rb | 2 +- test/models/customer_test.rb | 8 -------- 3 files changed, 1 insertion(+), 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/models/movie.rb b/app/models/movie.rb index 074012735..866cedd89 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,3 @@ class Movie < ApplicationRecord - # belongs_to :customer + belongs_to :customer end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index e171f1324..dbe89b053 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,13 +1,5 @@ require "test_helper" -# validates :name, presence: true -# validates :registered_at, presence: true -# validates :address, presence: true -# validates :city, presence: true -# validates :state, presence: true -# validates :postal_code, presence: true -# validates :phone, presence: true - describe Customer do let(:customer) { customers(:one) } From 18c3df13397997b05978e54e91e080ea8bcd5ff5 Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Tue, 7 Nov 2017 10:19:14 -0800 Subject: [PATCH 20/30] Add moveis count to customer --- .../20171107181635_add_checked_out_count_to_customer.rb | 5 +++++ db/schema.rb | 3 ++- test/controllers/customers_controller_test.rb | 3 ++- test/controllers/movies_controller_test.rb | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20171107181635_add_checked_out_count_to_customer.rb diff --git a/db/migrate/20171107181635_add_checked_out_count_to_customer.rb b/db/migrate/20171107181635_add_checked_out_count_to_customer.rb new file mode 100644 index 000000000..4c9a7846c --- /dev/null +++ b/db/migrate/20171107181635_add_checked_out_count_to_customer.rb @@ -0,0 +1,5 @@ +class AddCheckedOutCountToCustomer < ActiveRecord::Migration[5.1] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 028a5f1b8..f88589461 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171106215930) do +ActiveRecord::Schema.define(version: 20171107181635) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -26,6 +26,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.float "account_credit" + t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2b5339a13..add671278 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -111,7 +111,8 @@ patch customer_path(customer.id), params: customer_data must_respond_with :success - # customer.name.must_equal customer_data[:name] + customer.reload + customer.name.must_equal customer_data[:name] end it "won't update customer information if data is missing" do diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d3b21fb95..1ca0995cb 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -16,7 +16,6 @@ it "returns an array" do get movies_path - # This returns the body of all pets! body = JSON.parse(response.body) body.must_be_kind_of Array end From 3f49495431ebc0a129dec74e0b48085c963c2a9e Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Tue, 7 Nov 2017 10:22:04 -0800 Subject: [PATCH 21/30] Fix test to match new column --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index cf493ce5e..76f311958 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -62,6 +62,6 @@ def update private def customer_params - params.permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit) + params.permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit, :movies_checked_out_count) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index add671278..7440fb1e0 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -28,7 +28,7 @@ get customers_path body = JSON.parse(response.body) body.each do |customer| - customer.keys.sort.must_equal ["account_credit", "address", "city", "id", "name", "phone", "postal_code", "registered_at", "state"] + customer.keys.sort.must_equal ["account_credit", "address", "city", "id", "movies_checked_out_count", "name", "phone", "postal_code", "registered_at", "state"] end end From 9214ea939955373129fd45b827eb5994737dc137 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 7 Nov 2017 10:40:22 -0800 Subject: [PATCH 22/30] Add tests to the movie controller after adding the available inventory create method --- app/controllers/movies_controller.rb | 10 +++------- app/models/movie.rb | 15 +++++++++++---- test/controllers/movies_controller_test.rb | 22 +++++++++++++++------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d11061af7..f258042e3 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,4 @@ class MoviesController < ApplicationController - def index movies = Movie.all render( @@ -11,11 +10,11 @@ def show movie = Movie.find_by(id: params[:id]) if movie render( - json: movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]), status: :ok + json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok ) else render( - json: { "nothing" => true}, status: :not_found + json: { "nothing" => true }, status: :not_found ) end end @@ -31,12 +30,9 @@ def create end end - def update - end - private def movies_params - params.permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index fec7c8240..43c959789 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,14 @@ class Movie < ApplicationRecord - # belongs_to :customer + before_create :set_available_inventory + validates :title, presence: true - # validates :overview, presence: true - # validates :release_date, presence: true - # validates :inventory, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, numericality: { only_integer: true, greater_than: -1 } + + private + + def set_available_inventory + self.available_inventory = self.inventory + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 36040eae5..8ee29a36f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -64,6 +64,15 @@ body = JSON.parse(response.body) body.must_equal "nothing" => true end + + it "returns a single movie with the required fields" do + keys = ["available_inventory", "inventory", "overview", "release_date", "title"] + + get movie_path(movie.id) + + body = JSON.parse(response.body) + body.keys.sort.must_equal keys + end end describe "create" do @@ -72,7 +81,8 @@ title: "Harry Potter", overview: "A boy who lived with the scar", release_date: 2001-11-16, - inventory: 3 + inventory: 3, + available_inventory: 3 } } @@ -80,7 +90,8 @@ { overview: "A boy who lived with the scar", release_date: 2001-11-16, - inventory: 3 + inventory: 3, + available_inventory: 3 } } @@ -90,6 +101,8 @@ }.must_change 'Movie.count', 1 response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.keys.must_equal ["id"] must_respond_with :success end @@ -99,9 +112,4 @@ must_respond_with :bad_request end end - - describe "update" do - it "returns success if the movie is updated" do - end - end end From 9811e3099a05587c3e549b75aaf88616bfaa58c7 Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Tue, 7 Nov 2017 10:46:51 -0800 Subject: [PATCH 23/30] Add serializer to customer --- Gemfile | 2 ++ Gemfile.lock | 9 +++++++++ app/controllers/customers_controller.rb | 5 +++-- app/serializers/customer_serializer.rb | 4 ++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 app/serializers/customer_serializer.rb diff --git a/Gemfile b/Gemfile index a6e0bdd54..30570bf82 100644 --- a/Gemfile +++ b/Gemfile @@ -25,6 +25,8 @@ gem 'puma', '~> 3.7' # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible # gem 'rack-cors' +gem 'active_model_serializers' + 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] diff --git a/Gemfile.lock b/Gemfile.lock index 484707437..b49a96958 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,6 +24,11 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) + active_model_serializers (0.10.6) + actionpack (>= 4.1, < 6) + activemodel (>= 4.1, < 6) + case_transform (>= 0.2) + jsonapi-renderer (>= 0.1.1.beta1, < 0.2) activejob (5.1.4) activesupport (= 5.1.4) globalid (>= 0.3.6) @@ -48,6 +53,8 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (9.1.0) + case_transform (0.2) + activesupport coderay (1.1.2) concurrent-ruby (1.0.5) crass (1.0.2) @@ -61,6 +68,7 @@ GEM jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks + jsonapi-renderer (0.1.3) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -151,6 +159,7 @@ PLATFORMS ruby DEPENDENCIES + active_model_serializers better_errors binding_of_caller byebug diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 76f311958..afe09e3b9 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,7 +5,8 @@ def index customers = Customer.all render( - json: customers.as_json(except: [:created_at, :updated_at]), + # json: customers.as_json(except: [:created_at, :updated_at]), + json: customers, status: :ok ) end @@ -14,7 +15,7 @@ def show customer = Customer.find_by(id: params[:id]) if customer render( - json: customer.as_json(except: [:created_at, :updated_at]), + json: customer, status: :ok ) else diff --git a/app/serializers/customer_serializer.rb b/app/serializers/customer_serializer.rb new file mode 100644 index 000000000..8d940403d --- /dev/null +++ b/app/serializers/customer_serializer.rb @@ -0,0 +1,4 @@ +class CustomerSerializer < ActiveModel::Serializer + attributes :id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit, :movies_checked_out_count + +end From 85b501e46af26ed28d50430a0b8738210a920d06 Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Tue, 7 Nov 2017 10:51:41 -0800 Subject: [PATCH 24/30] Comment out the initializer for now --- app/controllers/customers_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index afe09e3b9..7e1688301 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,8 +5,8 @@ def index customers = Customer.all render( - # json: customers.as_json(except: [:created_at, :updated_at]), - json: customers, + json: customers.as_json(except: [:created_at, :updated_at]), + # json: customers, status: :ok ) end @@ -15,7 +15,8 @@ def show customer = Customer.find_by(id: params[:id]) if customer render( - json: customer, + # json: customer, + json: customer.as_json(except: [:created_at, :updated_at]), status: :ok ) else From d2ab1bbec912629784edd42bf6d6d954f8956177 Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Tue, 7 Nov 2017 10:55:54 -0800 Subject: [PATCH 25/30] Add default value of 0 to movies checked out by customer --- .../20171107185255_add_default_value_to_checkedout_movies.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20171107185255_add_default_value_to_checkedout_movies.rb diff --git a/db/migrate/20171107185255_add_default_value_to_checkedout_movies.rb b/db/migrate/20171107185255_add_default_value_to_checkedout_movies.rb new file mode 100644 index 000000000..d03c7b06b --- /dev/null +++ b/db/migrate/20171107185255_add_default_value_to_checkedout_movies.rb @@ -0,0 +1,5 @@ +class AddDefaultValueToCheckedoutMovies < ActiveRecord::Migration[5.1] + def change + change_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index f88589461..a052bc5fc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171107181635) do +ActiveRecord::Schema.define(version: 20171107185255) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -26,7 +26,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.float "account_credit" - t.integer "movies_checked_out_count" + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| From 3ec132d06afc6136ea54b6cf3d9c30f072c1f1b8 Mon Sep 17 00:00:00 2001 From: Iuliia Chikulaeva Date: Tue, 7 Nov 2017 10:59:32 -0800 Subject: [PATCH 26/30] Get initializer to work --- app/controllers/customers_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 7e1688301..f3a81ad85 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,8 +5,8 @@ def index customers = Customer.all render( - json: customers.as_json(except: [:created_at, :updated_at]), - # json: customers, + # json: customers.as_json(except: [:created_at, :updated_at]), + json: customers, status: :ok ) end @@ -15,8 +15,8 @@ def show customer = Customer.find_by(id: params[:id]) if customer render( - # json: customer, - json: customer.as_json(except: [:created_at, :updated_at]), + json: customer, + # json: customer.as_json(except: [:created_at, :updated_at]), status: :ok ) else From 3bea4b22abef3c28a1c3d6fb28317b77ae486a63 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 7 Nov 2017 11:02:13 -0800 Subject: [PATCH 27/30] Add recent changes --- app/models/customer.rb | 2 +- db/schema.rb | 4 ---- test/models/movie_test.rb | 3 +++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index a37a1b6db..15b51f17f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord - has_many :movies + # has_many :movies validates :name, presence: true validates :registered_at, presence: true diff --git a/db/schema.rb b/db/schema.rb index 15a5e048a..f7d126764 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -<<<<<<< HEAD ActiveRecord::Schema.define(version: 20171107181635) do -======= -ActiveRecord::Schema.define(version: 20171107173425) do ->>>>>>> MovieControllerTesting # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 2719f5fff..958ac4ed6 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,4 +1,7 @@ require "test_helper" describe Movie do + describe "validations" do + it "" + end end From f306dc31f736ca75d36d283ed160ec69a1b7b4ee Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 7 Nov 2017 11:52:27 -0800 Subject: [PATCH 28/30] Remove serializer from movie controller and add tests to movie model --- app/serializers/movie_serializer.rb | 3 +++ test/models/customer_test.rb | 12 ++++----- test/models/movie_test.rb | 42 ++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 app/serializers/movie_serializer.rb diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb new file mode 100644 index 000000000..4065721d1 --- /dev/null +++ b/app/serializers/movie_serializer.rb @@ -0,0 +1,3 @@ +class MovieSerializer < ActiveModel::Serializer + # attributes :id, :title, :release_date, :inventory, :available_inventory +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index dbe89b053..ee5a9aeab 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,12 +4,12 @@ let(:customer) { customers(:one) } describe "relations" do - it "a customer can have many movies" do - customer.must_respond_to :movies - # customer.movies.each do |movie| - # movie.must_be_kind_of Movie - # end - end + # it "a customer can have many movies" do + # customer.must_respond_to :movies + # # customer.movies.each do |movie| + # # movie.must_be_kind_of Movie + # # end + # end end describe "validations" do diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 958ac4ed6..ae52c79cd 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,47 @@ require "test_helper" describe Movie do + let(:movie_data) { + { + title: "This is a new movie", + overview: "Not sure what kind of movie this is", + release_date: 1960-06-16, + inventory: 1, + available_inventory: nil + } + } + describe "validations" do - it "" + it "allows a movie to be created with all required parameters" do + before_count = Movie.all.count + + movie = Movie.new(movie_data) + movie.save + + movie.must_be :valid? + Movie.count.must_equal before_count + 1 + end + + it "will not be created without the required parameters" do + before_count = Movie.all.count + invalid_data = { + title: "", + overview: "", + release_date: "", + inventory: "", + available_inventory: nil + } + movie = Movie.new(invalid_data) + + movie.wont_be :valid? + Movie.count.must_equal before_count + end + + it "sets the available_inventory to the current_invetory" do + movie = Movie.new(movie_data) + movie.save + + movie.available_inventory.must_equal 1 + end end end From 78458551915d6dcb84d4bfdb42bbbab5c5300525 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 7 Nov 2017 12:11:37 -0800 Subject: [PATCH 29/30] Fix routes and params --- app/controllers/movies_controller.rb | 2 +- config/routes.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f258042e3..5399c47ee 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -33,6 +33,6 @@ def create private def movies_params - params.permit(:title, :overview, :release_date, :inventory, :available_inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/config/routes.rb b/config/routes.rb index c871f767f..af4cdea41 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :movies, only:[:index, :show, :create, :update] - resources :customers, only:[:index, :show, :create, :update] - + resources :movies, only:[:index, :show, :create] + resources :customers, only:[:index, :show, :create] + end From 5eb601930c75335e5fe3cd71921f8bc4646339fe Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 7 Nov 2017 15:02:23 -0800 Subject: [PATCH 30/30] Change routes --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index af4cdea41..7707b1a9c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :movies, only:[:index, :show, :create] - resources :customers, only:[:index, :show, :create] + resources :customers, only:[:index, :show, :create, :update] end