From 7e75b2663bdfc5eb75441615cb8d103c699c676b Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Tue, 9 May 2017 14:37:45 -0700 Subject: [PATCH 01/26] initial rails app setup --- .gitignore | 17 ++ Gemfile | 53 ++++ Gemfile.lock | 177 +++++++++++ README.md | 282 +----------------- Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 34 +++ bin/spring | 17 ++ bin/update | 29 ++ config.ru | 5 + config/application.rb | 34 +++ config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++ config/environments/production.rb | 78 +++++ config/environments/test.rb | 42 +++ .../application_controller_renderer.rb | 6 + 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/new_framework_defaults.rb | 18 ++ config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 23 ++ config/puma.rb | 47 +++ config/routes.rb | 3 + config/secrets.yml | 22 ++ config/spring.rb | 6 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 26 ++ tmp/.keep | 0 54 files changed, 925 insertions(+), 269 deletions(-) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/new_framework_defaults.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..48fb168f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore Byebug command history file. +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..f5ebe044e --- /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.0.2' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# 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', platform: :mri +end + +group :development do + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'pry-rails' +end + +gem 'foundation-rails' +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..6be8f4203 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,177 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (7.1.4) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.0.6) + coderay (1.1.1) + concurrent-ruby (1.0.5) + debug_inspector (0.0.3) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + foundation-rails (6.3.1.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.14) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.0.0) + nokogiri (1.7.2) + mini_portile2 (~> 2.1.0) + pg (0.20.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.8.2) + rack (2.0.2) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + ruby-progressbar (1.8.1) + sass (3.4.23) + slop (3.6.0) + spring (2.0.1) + 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-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) + 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 + foundation-rails + listen (~> 3.0.5) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.0) + rails (~> 5.0.2) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.14.6 diff --git a/README.md b/README.md index fb85e2b48..7db80e4ca 100644 --- a/README.md +++ b/README.md @@ -1,280 +1,24 @@ -# Project: VideoStoreAPI -The goal of this project is to create a system that a video store (remember those?) could use to track their inventory of rental videos and their list of customers. +# README -We will use Rails to construct a RESTful API. The purpose of this API is to quickly serve information about the store's video collection, customer information, and to update rental status. This repository provides two JSON datafiles to serve as the initial seeds for this system. +This README would normally document whatever steps are necessary to get the +application up and running. -This is a pair project. You and your partner should use all the techniques we've learned so far to keep yourselves organized and on track, and ensure that no requirements slip through the cracks. +Things you may want to cover: -## Learning Goals -Upon completing this project, students should be able to: +* Ruby version -- Build an ERD and set up ActiveRecord models for a given dataset / use-case -- Expose database contents through a web API -- Respond reasonably to bad user data in the context of an API -- Verify the correctness of an API using controller tests +* System dependencies -This is a [stage 2](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) project. +* Configuration -## Success Criteria -Your project will be evaluated against the following requirements: +* Database creation -- API conformance - - The provided smoke tests should pass (see the subfolder) - - Bad data sent to the API should result in an appropriate status code and helpful error -- Test coverage - - Models: All relations, validations, and custom model methods should include at least one positive and one negative test case - - Controllers: Every API endpoint should include at least one positive and one negative test case -- Style and Organization - - Business logic should be live in models +* Database initialization -## Project Baseline -- Read the API Requirements below and create a pseudo-code "routes" file that specifies - - The _endpoints_ your API will need - - The _HTTP verbs_ each endpoint will use - - Any data that must be provided to the endpoint in order for it to do its work -- Read the Seed Data description below and, bearing in mind the API Requirements, create an ERD for your database that specifies - - The _models_ your database will require - - The _attributes_ for each model - - Any _relationships_ between models -- Create a new Rails app to serve as the API - - **Create the rails app with:** `$ rails new . --api` -- Create a route that responds to `/zomg` that serves a json-encoded "it works!" +* How to run the test suite -## Wave 1: Database Models, Tables, & Seeds -- Generate Rails models and associations to match your ERD -- Use the provided seed script `db/seeds.rb` to import the provided JSON data into your database +* Services (job queues, cache servers, search engines, etc.) -### Seed Data -`movies.json` contains information about the videos available to rent at the store. The data is presented as an array of objects, with each object having the following key-value pairs: +* Deployment instructions -| Field | Datatype | Description -|----------------|----------|------------ -| `title` | string | The title of the film -| `overview` | string | A short plot synopsis -| `release_date` | string | `YYYY-MM-DD`, Day the film was originally released -| `inventory` | integer | How many copies of the film the video store owns - -`customers.json` contains information about the customers that have rented with the store in the past. The data is presented as, you guessed it, an array of objects, with each object have the following key-value pairs: - -| Field | Datatype | Description -|------------------|----------|------------ -| `name` | string | The customer's name -| `registered_at` | string | `Wed, 29 Apr 2015 07:54:14 -0700`, When the customer first visited the store -| `address` | string | Street address -| `city` | string |   -| `state` | string |   -| `postal_code` | string |   -| `phone` | string | Primary contact phone number - -### Testing -As with all Rails projects, model testing is a requirement. You should have _at least_ one positive and one negative test case for each relation, validation, and custom function you add to your models. - -Use good TDD practices, and test _before_ you code. Remember: red-green-refactor. - -## Waves 2 Coding The API -In this wave, you will implement the API described below. The endpoints are described more-or-less in order of complexity, and we recommend you build them in that order. Every endpoint must serve JSON data, and must use HTTP response codes to indicate the status of the request. - -The schema of your database and the structure of your rails app are completely up to you, so long as the API conforms to the description and provided script. - -### Error Handling -If something goes wrong, your API should return an appropriate [HTTP status code](http://billpatrianakos.me/blog/2013/10/13/list-of-rails-status-code-symbols/), as well as a list of errors. The list should be formatted like this: - -```json -{ - "errors": { - "title": ["Movie 'Revenge of the Gnomes' not found"] - } -} -``` - -All errors your API can return should be covered by at least one test case. - -### Testing -Because APIs are often open to the public, thorough testing is essential. For a Rails API, that means controller testing. - -For each API endpoint, you should have _at least_: -- A basic test with no parameters, if applicable -- Positive and negative tests for any URI parameters (user ID, movie title) -- Testing around any data in the request body - -Use good TDD practices, and test _before_ you code. Remember: red-green-refactor. - -#### Smoke Tests -Because this API will be used as the backend for a future project, there are strict requirements about how it should be structured. To this end, we have provided a set of [smoke tests](http://softwaretestingfundamentals.com/smoke-testing/) written in Postman to exercise all the endpoints. - -The smoke tests will verify that your API looks correct to the outside world, by sending actual HTTP requests to your running server and checking the results. They test things like: - -- Did I get a success response for a valid request? -- Did the API return JSON? -- Does the JSON contain the expected property names? - -**The smoke tests are not a substitute for writing your own tests!!!!!** They do **not** check that the content is _correct_, nor do they cover any negative or edge cases. Verifying correctness in these cases is **your** responsibility. - -The smoke tests live in the file [`test/VideoStoreAPI_smoke_tests.postman_collection.json`](test/VideoStoreAPI_smoke_tests.postman_collection.json). To run them: - -1. Open Postman -1. Click `Import` in the top left -1. Drag-and-drop the file into the box -1. In the left sidebar, click on the `Collections` tab -1. There should now be an entry for the smoke tests. Hover over it and click the `>` icon for a detail view. -1. Click the blue `Run` button. This will launch the collection runner. -1. In the collection runner, scroll down in the center pane and click the blue `Start Test` button - -## API Description - -#### `GET /customers` -List all customers - -Fields to return: -- `id` -- `name` -- `registered_at` -- `postal_code` -- `phone` -- `movies_checked_out_count` - - This will be 0 unless you've completed optional requirements - -#### `GET /movies` -List all movies - -Fields to return: -- `title` -- `release_date` - -#### `GET /movies/:title` -Look a movie up by `title` - -URI parameters: -- `title`: Movie title (e.g. `Jaws`) - -Fields to return: -- `title` -- `overview` -- `release_date` -- `inventory` (total) -- `available_inventory` (not currently checked-out to a customer) - - This will be the same as `inventory` unless you've completed the optional endpoints. - -### Optional Rentals - -Wave 2 focused on **reading** data from the API. In these endpoints you will interact with the API changing models through POST requests. - -#### `POST /rentals/:title/check-out` -Check out one of the movie's inventory to the customer. The rental's check-out date should be set to today. - -**Note:** Some of the fields from wave 2 should now have interesting values. Good thing you wrote tests for them, right... right? - -URI parameters: -- `title`: Movie title (e.g. `Jaws`) - -Request body: - -| Field | Datatype | Description -|---------------|---------------------|------------ -| `customer_id` | integer | ID of the customer checking out this film -| `due_date` | string `YYYY-MM-DD` | When should this movie be checked back in? - -#### `POST /rentals/:title/check-in` -Check in one of a customer's rentals - -Request body: - -| Field | Datatype | Description -|---------------|----------|------------ -| `customer_id` | integer | ID of the customer checking in this film - -#### `GET /rentals/overdue` -List all customers with overdue movies - -Fields to return: -- `title` -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -## Going Further -These really are **optional** - if you've gotten here and you have time left, that means you're moving speedy fast! - -### Query Parameters -Any endpoint that returns a list should accept 3 _optional_ [query parameters](http://guides.rubyonrails.org/action_controller_overview.html#parameters): - -| Name | Value | Description -|--------|---------|------------ -| `sort` | string | Sort objects by this field, in ascending order -| `n` | integer | Number of responses to return per page -| `p` | integer | Page of responses to return - -So, for an API endpoint like `GET /customers`, the following requests should be valid: -- `GET /customers`: All customers, sorted by ID -- `GET /customers?sort=name`: All customers, sorted by name -- `GET /customers?n=10&p=2`: Customers 10-19, sorted by ID -- `GET /customers?sort=name&n=10&p=2`: Customers 10-19, sorted by name - -Of course, adding new features means you should be adding new controller tests to verify them. - -Things to note: -- Sorting by ID is the rails default -- Possible sort fields: - - Customers can be sorted by `name`, `registered_at` and `postal_code` - - Movies can be sorted by `title` and `release_date` - - Overdue rentals can be sorted by `title`, `name`, `checkout_date` and `due_date` -- If the client requests both sorting and pagination, pagination should be relative to the sorted order -- Check out the [will_paginate gem](https://github.com/mislav/will_paginate) - -### More Endpoints: Inventory Management -All these endpoints should support all 3 query parameters. All fields are sortable. - -#### `GET /movies/:title/current` -List customers that have _currently_ checked out a copy of the film - -URI parameters: -- `title`: Movie title (e.g. `Jaws`) - -Fields to return: -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /movies/:title/history` -List customers that have checked out a copy of the film _in the past_ - -URI parameters: -- `title`: Movie title (e.g. `Jaws`) - -Fields to return: -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /customers/:id/current` -List the movies a customer _currently_ has checked out - -URI parameters: -- `id`: Customer ID - -Fields to return: -- `title` -- `checkout_date` -- `due_date` - -#### `GET /customers/:id/history` -List the movies a customer has checked out _in the past_ - -URI parameters: -- `id`: Customer ID - -Fields to return: -- `title` -- `checkout_date` -- `due_date` - - -# Reference -- [Postman on Environments](https://www.getpostman.com/docs/environments) - \ No newline at end of file +* ... diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..e620b4dad --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/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..4fbf1ef3a --- /dev/null +++ b/config/application.rb @@ -0,0 +1,34 @@ +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 + # Force new test files to be generated in the minitest-spec style + config.generators do |g| + g.test_framework :minitest, spec: true + end + # 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..0bbde6f74 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..aead51124 --- /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..082a013ab --- /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=172800' + } + 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..49275a9d6 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,78 @@ +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 + + # 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..30587ef6d --- /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=3600' + } + + # 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..51639b67a --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) 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/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..d859e4bea --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,18 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } 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..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# 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. +# +# 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..c7f311f81 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# 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 }.to_i +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! + +# 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 `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, 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..61a9bb3a8 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# 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. + +development: + secret_key_base: e17da9094218c877a7bc3e5a1f03925e3e0c47a589cf123bc476bb74562d040fa77b61ce40163973d3f21868779df5867c4280d0d654275acd246b15735fa52d + +test: + secret_key_base: ea4f2ff5b0c9b8767c58618c8257742d36ecd3d757aa24a850558a6fa2ce12a1d2afb4df4f510c450cd8ec9ebf64dc7189d784a92f6e2143d1218b078d275c25 + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..cc375119f --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" + require "minitest/reporters" # for Colorized output + + # For colorful output! + Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter + ) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb From 47637205bacba225abdf8e9d942c958fbf56bd46 Mon Sep 17 00:00:00 2001 From: Danielle Birbal Date: Tue, 9 May 2017 14:54:25 -0700 Subject: [PATCH 02/26] Generated Customer Model --- app/models/customer.rb | 3 +++ db/migrate/20170509214809_create_customers.rb | 16 ++++++++++++++ test/fixtures/customers.yml | 21 +++++++++++++++++++ test/models/customer_test.rb | 9 ++++++++ 4 files changed, 49 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20170509214809_create_customers.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/models/customer_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..177266dd9 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + has_and_belongs_to_many :movies +end diff --git a/db/migrate/20170509214809_create_customers.rb b/db/migrate/20170509214809_create_customers.rb new file mode 100644 index 000000000..3887753d6 --- /dev/null +++ b/db/migrate/20170509214809_create_customers.rb @@ -0,0 +1,16 @@ +class CreateCustomers < ActiveRecord::Migration[5.0] + def change + create_table :customers do |t| + t.string :name + t.string :registered_at + t.string :postal_code + t.string :phone + t.integer :movies_checked_out_count + t.string :address + t.string :city + t.string :state + + t.timestamps + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..6c5d5a3dd --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,21 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: MyString + postal_code: MyString + phone: MyString + movies_checked_out_count: 1 + address: MyString + city: MyString + state: MyString + +two: + name: MyString + registered_at: MyString + postal_code: MyString + phone: MyString + movies_checked_out_count: 1 + address: MyString + city: MyString + state: MyString 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 From ae9a672daf5b9d5bb7d2603623153caf2341e81c Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Tue, 9 May 2017 15:05:15 -0700 Subject: [PATCH 03/26] movies migration, join-table migration, added account_credit --- app/models/movie.rb | 3 ++ db/migrate/20170509214215_create_movies.rb | 13 +++++ ...70509215144_create_customer_movies_join.rb | 8 +++ ...9215753_add_account_credit_to_customers.rb | 5 ++ db/schema.rb | 49 +++++++++++++++++++ test/fixtures/movies.yml | 15 ++++++ test/models/movie_test.rb | 9 ++++ 7 files changed, 102 insertions(+) create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20170509214215_create_movies.rb create mode 100644 db/migrate/20170509215144_create_customer_movies_join.rb create mode 100644 db/migrate/20170509215753_add_account_credit_to_customers.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/movie_test.rb diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..ea8abd0d9 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,3 @@ +class Movie < ApplicationRecord + has_and_belongs_to_many :customers +end diff --git a/db/migrate/20170509214215_create_movies.rb b/db/migrate/20170509214215_create_movies.rb new file mode 100644 index 000000000..26e5841b4 --- /dev/null +++ b/db/migrate/20170509214215_create_movies.rb @@ -0,0 +1,13 @@ +class CreateMovies < ActiveRecord::Migration[5.0] + def change + create_table :movies do |t| + t.string :title + t.string :release_date + t.string :overview + t.integer :inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20170509215144_create_customer_movies_join.rb b/db/migrate/20170509215144_create_customer_movies_join.rb new file mode 100644 index 000000000..c61b54cec --- /dev/null +++ b/db/migrate/20170509215144_create_customer_movies_join.rb @@ -0,0 +1,8 @@ +class CreateCustomerMoviesJoin < ActiveRecord::Migration[5.0] + def change + create_table :customer_movies_joins do |t| + t.belongs_to :customer, index: true + t.belongs_to :movie, index: true + end + end +end diff --git a/db/migrate/20170509215753_add_account_credit_to_customers.rb b/db/migrate/20170509215753_add_account_credit_to_customers.rb new file mode 100644 index 000000000..0b545e4ec --- /dev/null +++ b/db/migrate/20170509215753_add_account_credit_to_customers.rb @@ -0,0 +1,5 @@ +class AddAccountCreditToCustomers < ActiveRecord::Migration[5.0] + 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..d3335d8ec --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,49 @@ +# 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: 20170509215753) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customer_movies_joins", force: :cascade do |t| + t.integer "customer_id" + t.integer "movie_id" + t.index ["customer_id"], name: "index_customer_movies_joins_on_customer_id", using: :btree + t.index ["movie_id"], name: "index_customer_movies_joins_on_movie_id", using: :btree + end + + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "registered_at" + t.string "postal_code" + t.string "phone" + t.integer "movies_checked_out_count" + t.string "address" + t.string "city" + t.string "state" + 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 "release_date" + t.string "overview" + t.integer "inventory" + t.integer "available_inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..2e41e6de4 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + release_date: MyString + overview: MyString + inventory: 1 + available_inventory: 1 + +two: + title: MyString + release_date: MyString + overview: MyString + inventory: 1 + available_inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From 399937ffd7b82ee5ea6f0527197fb1c33daf4e51 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Tue, 9 May 2017 15:09:21 -0700 Subject: [PATCH 04/26] added routes --- config/routes.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..6baaaff25 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,8 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + get "/customers", to: "customers#index", as: "customers" + get "/movies", to: "movies#index", as: "movies" + get "/movies/:title", to: "movies#index", as: "movies_by_title" + end From b23daf06d98afd3ec4f5c8da481b953f0efc0a06 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Tue, 9 May 2017 15:12:17 -0700 Subject: [PATCH 05/26] created customers controller --- app/controllers/customers_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 91a286a225d77c0333faab448aeeef9a15006cf1 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Tue, 9 May 2017 15:42:26 -0700 Subject: [PATCH 06/26] added controller tests --- app/controllers/customers_controller.rb | 4 +++ test/controllers/customers_controller_test.rb | 36 +++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..6116c28ef 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,6 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..3f567b069 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "gets customers 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 + + 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 customers with exactly the the required fields" do + #this has to be in this specific order or it will not pass + keys = %w(id movies_checked_out_count name phone postal_code registered_at) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end end From dc758068c7e6a9300a9194336d664dd0a64c49f7 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Tue, 9 May 2017 15:50:06 -0700 Subject: [PATCH 07/26] added test for customer relation --- test/models/customer_test.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..bf8c40d47 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,10 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } - - it "must be valid" do - value(customer).must_be :valid? + describe "associations/relation" do + it "has many movies" do + ar = Customer.reflect_on_association(:movies) + ar.macro.must_equal :has_and_belongs_to_many + end end end From 1d459578dbc290b889ca12e997a746114e94e21d Mon Sep 17 00:00:00 2001 From: Danielle Birbal Date: Tue, 9 May 2017 16:10:06 -0700 Subject: [PATCH 08/26] Added Movies Controller + Controller Tests --- app/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 16 +++++ config/routes.rb | 9 ++- test/controllers/customers_controller_test.rb | 7 +++ test/controllers/movies_controller_test.rb | 59 +++++++++++++++++++ test/fixtures/movies.yml | 14 ++--- 6 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..4270774e4 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,16 @@ +class MoviesController < ApplicationController + def index + @movies = Movie.all + render json: @movies.as_json(only: [:id, :title, :release_date]), status: :ok + end + + def show + @movie = Movie.find_by(title: params[:title]) + + if @movie.nil? + render json: {}, status: :not_found + else + render json: @movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok + end + end +end diff --git a/config/routes.rb b/config/routes.rb index 6baaaff25..47df61720 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,7 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - - get "/customers", to: "customers#index", as: "customers" - get "/movies", to: "movies#index", as: "movies" - get "/movies/:title", to: "movies#index", as: "movies_by_title" + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get '/customers', to: 'customers#index', as: 'customers' + get '/movies', to: 'movies#index', as: 'movies' + get '/movies/:title', to: 'movies#show', as: 'movie' end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..babea3fe5 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,59 @@ +require 'test_helper' + +describe MoviesController do + describe 'index' do + it 'is a 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 + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it 'returns all of the movies' do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it 'returns movies with exactly the required fields' do + keys = %w(id release_date title) + get movies_path + + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + end + + describe 'show' do + it 'can get a movie' do + get movie_path(movies(:one).title) + must_respond_with :success + end + + it 'returns movie with exactly the required fields' do + keys = %w(available_inventory inventory overview release_date title) + get movie_path(movies(:two).title) + + body = JSON.parse(response.body) + body.keys.sort.must_equal keys + end + + it 'returns 404 not found if movie does not exsist' do + get movie_path('No movie has this bogus title say Queen Tofu the fluff') + must_respond_with :not_found + end + end +end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 2e41e6de4..856d61d1b 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,15 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - release_date: MyString - overview: MyString + title: Tofu the Fluffer + release_date: 2016-01-05 + overview: What will happen when alien Tofu's come down to earth and enslave the human race with 100% pure fluff inventory: 1 available_inventory: 1 two: - title: MyString - release_date: MyString - overview: MyString - inventory: 1 + title: Tofu the Fluffanator II Revenge of the Fluff + release_date: 2017-01-05 + overview: She's back, and she's FLUFFIER + inventory: 5 available_inventory: 1 From 5b5733ddb96f59a3ee490cc123af4e32da48a5f6 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Tue, 9 May 2017 16:53:27 -0700 Subject: [PATCH 09/26] created rentals model --- app/models/rental.rb | 2 ++ db/migrate/20170509235238_create_rentals.rb | 14 ++++++++++++++ test/fixtures/rentals.yml | 17 +++++++++++++++++ test/models/rental_test.rb | 9 +++++++++ 4 files changed, 42 insertions(+) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20170509235238_create_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20170509235238_create_rentals.rb b/db/migrate/20170509235238_create_rentals.rb new file mode 100644 index 000000000..a0f9bddbc --- /dev/null +++ b/db/migrate/20170509235238_create_rentals.rb @@ -0,0 +1,14 @@ +class CreateRentals < ActiveRecord::Migration[5.0] + def change + create_table :rentals do |t| + t.string :title + t.integer :customer_id + t.string :name + t.string :postal_code + t.string :checkout_date + t.string :due_date + + t.timestamps + end + end +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..a7e804d28 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,17 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + customer_id: 1 + name: MyString + postal_code: MyString + checkout_date: MyString + due_date: MyString + +two: + title: MyString + customer_id: 1 + name: MyString + postal_code: MyString + checkout_date: MyString + due_date: MyString diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 13589da3f62e3a5955a3d356ed6e4eade184ee94 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Wed, 10 May 2017 09:02:11 -0700 Subject: [PATCH 10/26] migration for rentals --- db/schema.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index d3335d8ec..16e7439b7 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: 20170509215753) do +ActiveRecord::Schema.define(version: 20170509235238) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -46,4 +46,15 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.string "title" + t.integer "customer_id" + t.string "name" + t.string "postal_code" + t.string "checkout_date" + t.string "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end From eeedbcd958b62e9adf5ac9b9cb5ad2cc3bf6c0e3 Mon Sep 17 00:00:00 2001 From: Danielle Birbal Date: Wed, 10 May 2017 10:12:17 -0700 Subject: [PATCH 11/26] Expirementing with rental functionality --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/movies_controller.rb | 13 ++++++++ app/models/customer.rb | 3 +- app/models/movie.rb | 3 +- app/models/rental.rb | 2 ++ config/routes.rb | 2 ++ db/migrate/20170509235238_create_rentals.rb | 18 +++++------ db/schema.rb | 8 ++--- db/seeds.rb | 4 +-- test/controllers/movies_controller_test.rb | 16 ++++++++++ test/fixtures/customers.yml | 32 ++++++++++---------- test/models/movie_test.rb | 13 ++++---- test/models/rental_test.rb | 12 ++++---- 13 files changed, 79 insertions(+), 47 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0555e95c0e0865c74c7e24db6e7629054b89856a GIT binary patch literal 6148 zcmeHK!EVz)5S^_<>QE37LTZn`AaSTrA}Bc^q!3b}9*_`0Z~)ZWaoSpSyix2BAOz*Y zKLCHgr|<=Q4!l_}k=F^wB0xLQ?pv?l%+5T=*(?!>&LnIS)rrVOW2{_6x5oHBw-wva zGgpCvW5|9G%K%p#&YD%gD)6@}!0)a@K8$^@BtHb_2~?ehZL5)IPap@ zCOw4DP~{!dz+|h;i|k7#8!N=98f%sOIRB!b175VQ0^t@aV3sVaN66Syd3+%vuH3q ztY3Q|lgy8j!MH$w`8-NOIqk?v5~eE7V?R5EuUhD^zB8NcHCnsg?dINm*PFFk4UBKy zna^E!`+D=a#TMZ=+qGaSi!V1jMbli zpvM!yw#G${n1PAh6_~pUeZ&y@>>zS?+;40CBFEgFgjyMK^vXh?P=r2u2v5;Tv~#q* zRlq7>D&XXob>9E?e}Dcro$QrWz$)-xDIhA{Ublmi^xnEs9PhOr+7TKX^AjfuDS~3p4-# literal 0 HcmV?d00001 diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4270774e4..9cc98673c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,4 +13,17 @@ def show render json: @movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok end end + + def checkout(customer_id) + @movie = Movie.find_by(title: params[:title]) + @customer = Customer.find_by(id: customer_id) + + @movie.available_inventory -= 1 + + @rental = Rental.create(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Time.now, due_date: Time.now + 3.days) + + @customer.movies_checked_out_count = @customer.movies.length + + render json: @rental.as_json(only: [:customer_id, :due_date]) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 177266dd9..39bdc177e 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,4 @@ class Customer < ApplicationRecord - has_and_belongs_to_many :movies + has_many :movies, through: :movies + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index ea8abd0d9..2ad96cff8 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,4 @@ class Movie < ApplicationRecord - has_and_belongs_to_many :customers + has_many :customers, through: :rentals + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..84c8e3c2d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer end diff --git a/config/routes.rb b/config/routes.rb index 47df61720..df7eeb5fd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,6 @@ get '/customers', to: 'customers#index', as: 'customers' get '/movies', to: 'movies#index', as: 'movies' get '/movies/:title', to: 'movies#show', as: 'movie' + + post '/movies/:title/check-out', to: 'movies#checkout', as: 'checkout' end diff --git a/db/migrate/20170509235238_create_rentals.rb b/db/migrate/20170509235238_create_rentals.rb index a0f9bddbc..4df80376a 100644 --- a/db/migrate/20170509235238_create_rentals.rb +++ b/db/migrate/20170509235238_create_rentals.rb @@ -1,14 +1,12 @@ class CreateRentals < ActiveRecord::Migration[5.0] - def change - create_table :rentals do |t| - t.string :title - t.integer :customer_id - t.string :name - t.string :postal_code - t.string :checkout_date - t.string :due_date + def change + create_table :rentals do |t| + t.string :movie_id + t.integer :customer_id + t.datetime :checkout_date + t.datetime :due_date - t.timestamps + t.timestamps + end end - end end diff --git a/db/schema.rb b/db/schema.rb index 16e7439b7..ccaf4e47f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -47,12 +47,10 @@ end create_table "rentals", force: :cascade do |t| - t.string "title" + t.string "movie_id" t.integer "customer_id" - t.string "name" - t.string "postal_code" - t.string "checkout_date" - t.string "due_date" + t.datetime "checkout_date" + t.datetime "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..8a795a28f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,7 @@ JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - Customer.create!(customer) + Customer.create!(customer) end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + Movie.create!(movie) end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index babea3fe5..76129188c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -56,4 +56,20 @@ must_respond_with :not_found end end + + describe 'checkout' do + it 'can checkout a movie' do + test_customer = customers(:one) + movie_inventory = movies(:one).available_inventory + customer_movies = test_customer.movies + + post checkout_path(test_customer.id, title: movies(:one).title) + must_respond_with :success + + movie_inventory.must_equal movies(:one).available_inventory + 1 + customer_movies.count.must_equal test_customer.movies.count - 1 + + test_customer.movies.must_include movies(:one) + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 6c5d5a3dd..bd37c07b9 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,21 +1,21 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString - registered_at: MyString - postal_code: MyString - phone: MyString - movies_checked_out_count: 1 - address: MyString - city: MyString - state: MyString + name: Tofu + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + postal_code: 55555 + phone: 485-529-9385 + movies_checked_out_count: 0 + address: 837 Fluff Fluff Lane + city: Seattle + state: WA two: - name: MyString - registered_at: MyString - postal_code: MyString - phone: MyString - movies_checked_out_count: 1 - address: MyString - city: MyString - state: MyString + name: Toffee + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + postal_code: 99373 + phone: 927-836-9163 + movies_checked_out_count: 0 + address: 937 Bark Bark Aveneue + city: Freeport + state: NY diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..0ecfe450c 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,10 @@ -require "test_helper" +require 'test_helper' describe Movie do - let(:movie) { Movie.new } - - it "must be valid" do - value(movie).must_be :valid? - end + describe 'associations/relation' do + it 'has many movies' do + ar = Movie.reflect_on_association(:customers) + ar.macro.must_equal :has_and_belongs_to_many + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..aad349e7c 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,9 @@ -require "test_helper" +require 'test_helper' describe Rental do - let(:rental) { Rental.new } - - it "must be valid" do - value(rental).must_be :valid? - end + # let(:rental) { Rental.new } + # + # it "must be valid" do + # value(rental).must_be :valid? + # end end From 25d60bae3a91c15c8548e9488bf2407258bc4983 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Wed, 10 May 2017 10:20:40 -0700 Subject: [PATCH 12/26] changed rentals yml and customer relationship and test --- app/models/customer.rb | 2 +- test/fixtures/rentals.yml | 10 +++------- test/models/customer_test.rb | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 39bdc177e..900261ee2 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,4 @@ class Customer < ApplicationRecord - has_many :movies, through: :movies + has_many :movies, through: :rentals has_many :rentals end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index a7e804d28..5d7dc0dc7 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,17 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString + movie_id: 1 customer_id: 1 - name: MyString - postal_code: MyString checkout_date: MyString due_date: MyString two: - title: MyString - customer_id: 1 - name: MyString - postal_code: MyString + movie_id: 2 + customer_id: 2 checkout_date: MyString due_date: MyString diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index bf8c40d47..e9fc829f7 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,9 +2,9 @@ describe Customer do describe "associations/relation" do - it "has many movies" do + it "has many through movies" do ar = Customer.reflect_on_association(:movies) - ar.macro.must_equal :has_and_belongs_to_many + ar.macro.must_equal :have_many end end end From 4eddd7c2400d3594f8f6af1834b3d89f47bccd94 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Wed, 10 May 2017 10:44:51 -0700 Subject: [PATCH 13/26] updated tests for movie and customer relationships --- app/models/customer.rb | 1 + app/models/rental.rb | 4 ++-- test/fixtures/rentals.yml | 26 +++++++++++++------------- test/models/customer_test.rb | 6 +++++- test/models/movie_test.rb | 6 +++++- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 900261ee2..a9763e8d0 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,5 @@ class Customer < ApplicationRecord has_many :movies, through: :rentals has_many :rentals + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 84c8e3c2d..aa5899d5f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,4 @@ class Rental < ApplicationRecord - belongs_to :movie - belongs_to :customer + belongs_to :movie, foreign_key: 'movie_id' + belongs_to :customer, foreign_key: 'customer_id' end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 5d7dc0dc7..a8e9cbe75 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,13 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - movie_id: 1 - customer_id: 1 - checkout_date: MyString - due_date: MyString - -two: - movie_id: 2 - customer_id: 2 - checkout_date: MyString - due_date: MyString +# # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html +# +# one: +# movie_id: 1 +# customer_id: 1 +# checkout_date: MyString +# due_date: MyString +# +# two: +# movie_id: 2 +# customer_id: 2 +# checkout_date: MyString +# due_date: MyString diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index e9fc829f7..28fa24e60 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,7 +4,11 @@ describe "associations/relation" do it "has many through movies" do ar = Customer.reflect_on_association(:movies) - ar.macro.must_equal :have_many + ar.macro.must_equal :has_many + end + it "has many rentals" do + ar = Customer.reflect_on_association(:rentals) + ar.macro.must_equal :has_many end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 0ecfe450c..a62ca1ba0 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -4,7 +4,11 @@ describe 'associations/relation' do it 'has many movies' do ar = Movie.reflect_on_association(:customers) - ar.macro.must_equal :has_and_belongs_to_many + ar.macro.must_equal :has_many + end + it "has many rentals" do + ar = Movie.reflect_on_association(:rentals) + ar.macro.must_equal :has_many end end end From 5e4f2d456233be36df7f6a8c9f584350361b383c Mon Sep 17 00:00:00 2001 From: Danielle Birbal Date: Wed, 10 May 2017 13:19:32 -0700 Subject: [PATCH 14/26] Added CheckIn and CheckOut --- app/controllers/movies_controller.rb | 42 ++++++++++++++++--- config/routes.rb | 1 + db/migrate/20170509235238_create_rentals.rb | 2 +- .../20170510173554_add_movie_to_rentals.rb | 4 ++ db/schema.rb | 4 +- test/controllers/movies_controller_test.rb | 36 +++++++++++++--- test/fixtures/movies.yml | 4 +- test/fixtures/rentals.yml | 5 ++- 8 files changed, 79 insertions(+), 19 deletions(-) create mode 100644 db/migrate/20170510173554_add_movie_to_rentals.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9cc98673c..8e14525df 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,16 +14,46 @@ def show end end - def checkout(customer_id) + def checkout @movie = Movie.find_by(title: params[:title]) - @customer = Customer.find_by(id: customer_id) + @customer = Customer.find_by(id: params[:customer_id]) - @movie.available_inventory -= 1 + if Rental.find_by(movie_id: @movie.id, customer_id: @customer.id) + render status: :not_found + else + + new_availability = @movie.available_inventory -= 1 + @movie.update_attribute(:available_inventory, new_availability) + + @rental = Rental.new(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Time.now, due_date: Time.now + 3.days) - @rental = Rental.create(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Time.now, due_date: Time.now + 3.days) + customer_movie_count = @customer.movies.length + @customer.update_attribute(:movies_checked_out_count, customer_movie_count) - @customer.movies_checked_out_count = @customer.movies.length + if @rental.save + render json: @rental.as_json(only: [:customer_id, :due_date]), status: :ok + else + render status: :bad_request + end + end + end - render json: @rental.as_json(only: [:customer_id, :due_date]) + def checkin + @movie = Movie.find_by(title: params[:title]) + @customer = Customer.find_by(id: params[:customer_id]) + @rental = Rental.find_by(movie_id: @movie.id, customer_id: @customer.id) + + if @customer.movies.any? { |movie| movie.title == @movie.title } + new_availability = @movie.available_inventory += 1 + @movie.update_attribute(:available_inventory, new_availability) + + customer_movie_count = @customer.movies.length + @customer.update_attribute(:movies_checked_out_count, customer_movie_count) + + render json: @rental.as_json(only: [:customer_id]), status: :ok + @rental.destroy + else + render status: :bad_request + end end end diff --git a/config/routes.rb b/config/routes.rb index df7eeb5fd..66b29d627 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,4 +6,5 @@ get '/movies/:title', to: 'movies#show', as: 'movie' post '/movies/:title/check-out', to: 'movies#checkout', as: 'checkout' + post '/movies/:title/check-in', to: 'movies#checkin', as: 'checkin' end diff --git a/db/migrate/20170509235238_create_rentals.rb b/db/migrate/20170509235238_create_rentals.rb index 4df80376a..de94efb3e 100644 --- a/db/migrate/20170509235238_create_rentals.rb +++ b/db/migrate/20170509235238_create_rentals.rb @@ -1,7 +1,7 @@ class CreateRentals < ActiveRecord::Migration[5.0] def change create_table :rentals do |t| - t.string :movie_id + t.integer :movie_id t.integer :customer_id t.datetime :checkout_date t.datetime :due_date diff --git a/db/migrate/20170510173554_add_movie_to_rentals.rb b/db/migrate/20170510173554_add_movie_to_rentals.rb new file mode 100644 index 000000000..6cd56f917 --- /dev/null +++ b/db/migrate/20170510173554_add_movie_to_rentals.rb @@ -0,0 +1,4 @@ +class AddMovieToRentals < ActiveRecord::Migration[5.0] + def change + end +end diff --git a/db/schema.rb b/db/schema.rb index ccaf4e47f..0ca6d18b3 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: 20170509235238) do +ActiveRecord::Schema.define(version: 20170510173554) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -47,7 +47,7 @@ end create_table "rentals", force: :cascade do |t| - t.string "movie_id" + t.integer "movie_id" t.integer "customer_id" t.datetime "checkout_date" t.datetime "due_date" diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 76129188c..c97592c42 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -60,16 +60,40 @@ describe 'checkout' do it 'can checkout a movie' do test_customer = customers(:one) - movie_inventory = movies(:one).available_inventory - customer_movies = test_customer.movies + test_movie = movies(:one) - post checkout_path(test_customer.id, title: movies(:one).title) + movie_inventory = test_movie.available_inventory - 1 + customer_movies = test_customer.movies.length + 1 + + post checkout_path(customer_id: test_customer.id, title: test_movie.title) + must_respond_with :success + + test_movie.reload + + test_movie.available_inventory.must_equal movie_inventory + test_customer.movies.count.must_equal customer_movies + end + end + + describe 'checkin' do + it 'can checkin a movie' do + test_customer = customers(:one) + test_movie = movies(:one) + + movie_inventory = test_movie.available_inventory + customer_movies = test_customer.movies.length + + post checkout_path(customer_id: test_customer.id, title: test_movie.title) + test_movie.reload + test_movie.available_inventory.wont_equal movie_inventory + + post checkin_path(customer_id: test_customer.id, title: test_movie.title) must_respond_with :success - movie_inventory.must_equal movies(:one).available_inventory + 1 - customer_movies.count.must_equal test_customer.movies.count - 1 + test_movie.reload - test_customer.movies.must_include movies(:one) + test_movie.available_inventory.must_equal movie_inventory + test_customer.movies.count.must_equal customer_movies end end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 856d61d1b..aee46a6a9 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,8 @@ one: title: Tofu the Fluffer release_date: 2016-01-05 overview: What will happen when alien Tofu's come down to earth and enslave the human race with 100% pure fluff - inventory: 1 - available_inventory: 1 + inventory: 5 + available_inventory: 5 two: title: Tofu the Fluffanator II Revenge of the Fluff diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index a8e9cbe75..a77154215 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,5 +1,6 @@ -# # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -# + +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + # one: # movie_id: 1 # customer_id: 1 From fa7dbcc907b12ddca3ecaaaf9b8fc14b78b69f48 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Wed, 10 May 2017 13:20:27 -0700 Subject: [PATCH 15/26] serializer --- Gemfile | 2 ++ Gemfile.lock | 9 +++++++++ app/controllers/customers_controller.rb | 13 +++++++++---- app/models/customer.rb | 5 ++--- app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ app/serializers/rental_serializer.rb | 17 +++++++++++++++++ config/routes.rb | 12 +++++++----- 8 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 app/serializers/rental_serializer.rb diff --git a/Gemfile b/Gemfile index f5ebe044e..b5e149fc0 100644 --- a/Gemfile +++ b/Gemfile @@ -25,6 +25,8 @@ gem 'puma', '~> 3.0' # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible # gem 'rack-cors' +gem 'active_model_serializers', '~> 0.10.0' + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platform: :mri diff --git a/Gemfile.lock b/Gemfile.lock index 6be8f4203..08e0eb42a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,6 +24,11 @@ GEM erubis (~> 2.7.0) 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.0.2) activesupport (= 5.0.2) globalid (>= 0.3.6) @@ -52,6 +57,8 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (9.0.6) + case_transform (0.2) + activesupport coderay (1.1.1) concurrent-ruby (1.0.5) debug_inspector (0.0.3) @@ -65,6 +72,7 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.1) + jsonapi-renderer (0.1.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -158,6 +166,7 @@ PLATFORMS ruby DEPENDENCIES + active_model_serializers (~> 0.10.0) better_errors binding_of_caller byebug diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 07d6c7ea8..48309684e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,11 @@ class CustomersController < ApplicationController - def index - customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok - end + def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + end + def overdue + @rentals = Rental.where('due_date <= ?', Time.now) + render :json => @rentals, status: :ok + end + end diff --git a/app/models/customer.rb b/app/models/customer.rb index a9763e8d0..fc3419f2f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,4 @@ class Customer < ApplicationRecord - has_many :movies, through: :rentals - has_many :rentals - + has_many :movies, through: :rentals + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 2ad96cff8..5d82c6f82 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,6 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals has_many :rentals + # + # def return_movie_title end diff --git a/app/models/rental.rb b/app/models/rental.rb index aa5899d5f..8970c6883 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,6 @@ class Rental < ApplicationRecord belongs_to :movie, foreign_key: 'movie_id' belongs_to :customer, foreign_key: 'customer_id' + + end diff --git a/app/serializers/rental_serializer.rb b/app/serializers/rental_serializer.rb new file mode 100644 index 000000000..0fc96d92b --- /dev/null +++ b/app/serializers/rental_serializer.rb @@ -0,0 +1,17 @@ +class RentalSerializer < ActiveModel::Serializer + attributes :other_items, :customer_id, :checkout_date, :due_date + + def other_items + rentals = Rental.where('due_date <= ?', Time.now) + overdue_hash = {} + array = [] + rentals.each do |rental| + overdue_hash[:title] = rental.movie.title + overdue_hash[:name] = rental.customer.name + overdue_hash[:postal_code] = rental.customer.postal_code + array << overdue_hash + end + return array + end + +end diff --git a/config/routes.rb b/config/routes.rb index df7eeb5fd..d6b75553a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,11 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get '/customers', to: 'customers#index', as: 'customers' - get '/movies', to: 'movies#index', as: 'movies' - get '/movies/:title', to: 'movies#show', as: 'movie' + get '/customers', to: 'customers#index', as: 'customers' + get '/movies', to: 'movies#index', as: 'movies' + get '/movies/:title', to: 'movies#show', as: 'movie' - post '/movies/:title/check-out', to: 'movies#checkout', as: 'checkout' + post '/movies/:title/check-out', to: 'movies#checkout', as: 'checkout' + + get '/rentals/overdue', to: 'customers#overdue', as: 'overdue' end From f873171933862a91b9112dce19fa5389ac036a94 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Wed, 10 May 2017 14:51:18 -0700 Subject: [PATCH 16/26] rentals overdue method --- app/controllers/customers_controller.rb | 4 ++-- app/serializers/rental_serializer.rb | 2 +- config/routes.rb | 1 - db/schema.rb | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 48309684e..87324d31f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,8 +4,8 @@ def index render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end def overdue - @rentals = Rental.where('due_date <= ?', Time.now) - render :json => @rentals, status: :ok + rentals = Rental.where('due_date <= ?', Time.now) + render :json => rentals, status: :ok end end diff --git a/app/serializers/rental_serializer.rb b/app/serializers/rental_serializer.rb index 0fc96d92b..d0b77e63d 100644 --- a/app/serializers/rental_serializer.rb +++ b/app/serializers/rental_serializer.rb @@ -1,5 +1,5 @@ class RentalSerializer < ActiveModel::Serializer - attributes :other_items, :customer_id, :checkout_date, :due_date + attributes :other_items, :customer_id, :checkout_date, :due_date, :movie_id def other_items rentals = Rental.where('due_date <= ?', Time.now) diff --git a/config/routes.rb b/config/routes.rb index cde1026ce..16b8fdd0a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,6 @@ get '/movies/:title', to: 'movies#show', as: 'movie' - post '/movies/:title/check-out', to: 'movies#checkout', as: 'checkout' get '/rentals/overdue', to: 'customers#overdue', as: 'overdue' diff --git a/db/schema.rb b/db/schema.rb index 0ca6d18b3..2c4375667 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -47,7 +47,7 @@ end create_table "rentals", force: :cascade do |t| - t.integer "movie_id" + t.string "movie_id" t.integer "customer_id" t.datetime "checkout_date" t.datetime "due_date" From 6559b823539fc4b0fe9d594d91129c7db80e0fb3 Mon Sep 17 00:00:00 2001 From: Danielle Birbal Date: Wed, 10 May 2017 14:51:26 -0700 Subject: [PATCH 17/26] Fixed customer movie count --- app/controllers/movies_controller.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 8e14525df..fe5db0174 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -19,7 +19,7 @@ def checkout @customer = Customer.find_by(id: params[:customer_id]) if Rental.find_by(movie_id: @movie.id, customer_id: @customer.id) - render status: :not_found + render status: :bad_request else new_availability = @movie.available_inventory -= 1 @@ -27,10 +27,10 @@ def checkout @rental = Rental.new(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Time.now, due_date: Time.now + 3.days) - customer_movie_count = @customer.movies.length - @customer.update_attribute(:movies_checked_out_count, customer_movie_count) - if @rental.save + customer_movie_count = @customer.movies.count + @customer.update_attribute(:movies_checked_out_count, customer_movie_count) + render json: @rental.as_json(only: [:customer_id, :due_date]), status: :ok else render status: :bad_request @@ -47,11 +47,12 @@ def checkin new_availability = @movie.available_inventory += 1 @movie.update_attribute(:available_inventory, new_availability) - customer_movie_count = @customer.movies.length - @customer.update_attribute(:movies_checked_out_count, customer_movie_count) - render json: @rental.as_json(only: [:customer_id]), status: :ok @rental.destroy + + customer_movie_count = @customer.movies.count + @customer.update_attribute(:movies_checked_out_count, customer_movie_count) + else render status: :bad_request end From 7fd5aca4be03f3f5cb67d291db68bcc932f40daf Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Wed, 10 May 2017 15:18:50 -0700 Subject: [PATCH 18/26] created methods for overdue rentals method to print out movie title, customer name and postal code --- app/serializers/rental_serializer.rb | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/app/serializers/rental_serializer.rb b/app/serializers/rental_serializer.rb index d0b77e63d..13635a4bf 100644 --- a/app/serializers/rental_serializer.rb +++ b/app/serializers/rental_serializer.rb @@ -1,17 +1,13 @@ class RentalSerializer < ActiveModel::Serializer - attributes :other_items, :customer_id, :checkout_date, :due_date, :movie_id + attributes :customer_id, :checkout_date, :due_date, :title, :name, :postal_code - def other_items - rentals = Rental.where('due_date <= ?', Time.now) - overdue_hash = {} - array = [] - rentals.each do |rental| - overdue_hash[:title] = rental.movie.title - overdue_hash[:name] = rental.customer.name - overdue_hash[:postal_code] = rental.customer.postal_code - array << overdue_hash - end - return array + def title + return object.movie.title + end + def name + return object.customer.name + end + def postal_code + return object.customer.postal_code end - end From b8d4502da2629508941e8fed55d8d177eefd4eba Mon Sep 17 00:00:00 2001 From: Danielle Birbal Date: Wed, 10 May 2017 15:19:22 -0700 Subject: [PATCH 19/26] Removed unnecessary line --- app/models/movie.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 5d82c6f82..2ad96cff8 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,4 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals has_many :rentals - # - # def return_movie_title end From 8e713dd9faa1f357a3fcf29abf25526c1c2b8109 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Thu, 11 May 2017 10:12:10 -0700 Subject: [PATCH 20/26] tests for rental model and controller --- app/controllers/customers_controller.rb | 1 - config/routes.rb | 4 +- test/controllers/customers_controller_test.rb | 85 +++++++++++++------ test/models/rental_test.rb | 15 ++-- 4 files changed, 69 insertions(+), 36 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 87324d31f..2cfd50fb5 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -7,5 +7,4 @@ def overdue rentals = Rental.where('due_date <= ?', Time.now) render :json => rentals, status: :ok end - end diff --git a/config/routes.rb b/config/routes.rb index 16b8fdd0a..cfef306b3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,7 @@ get '/rentals/overdue', to: 'customers#overdue', as: 'overdue' - post '/movies/:title/check-out', to: 'movies#checkout', as: 'checkout' - post '/movies/:title/check-in', to: 'movies#checkin', as: 'checkin' + post '/movies/:title/check-out', to: 'movies#checkout', as: 'checkout' + post '/movies/:title/check-in', to: 'movies#checkin', as: 'checkin' end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index d9fc50ada..1570b0b80 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,37 +1,66 @@ require 'test_helper' describe CustomersController do - describe 'index' do - it 'gets customers route' do - get customers_path - must_respond_with :success - end + describe 'index' do + it 'gets customers 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 + it 'returns json' do + 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 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 all of the customers' do - get customers_path - body = JSON.parse(response.body) - body.length.must_equal Customer.count - end + it 'returns customers with exactly the the required fields' do + # this has to be in this specific order or it will not pass + keys = %w(id movies_checked_out_count name phone postal_code registered_at) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end + describe 'overdue' do + it "gets overdue path" do + get overdue_path + must_respond_with :success + end - it 'returns customers with exactly the the required fields' do - # this has to be in this specific order or it will not pass - keys = %w(id movies_checked_out_count name phone postal_code registered_at) - get customers_path - body = JSON.parse(response.body) - body.each do |customer| - customer.keys.sort.must_equal keys - end - end + it "returns json" do + get overdue_path + response.header['Content-Type'].must_include 'json' + end + it "returns an array" do + get overdue_path + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + it "returns all customers with overdue items" do + get overdue_path + body = JSON.parse(response.body) + body.length.must_equal Rental.where('due_date <= ?', Time.now).length + end + it "returns required fields" do + keys = %w(postal_code customer_id checkout_date due_date title name ) + get overdue_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index aad349e7c..82f11d4da 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,14 @@ require 'test_helper' describe Rental do - # let(:rental) { Rental.new } - # - # it "must be valid" do - # value(rental).must_be :valid? - # end + describe 'associations/relation' do + it 'belongs to customers' do + ar = Rental.reflect_on_association(:customer) + ar.macro.must_equal :belongs_to + end + it 'belongs to movies' do + ar = Rental.reflect_on_association(:movie) + ar.macro.must_equal :belongs_to + end + end end From d6c3a6b179a3910d3755caeceff2d8c74ab9ac7b Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Fri, 12 May 2017 10:59:25 -0700 Subject: [PATCH 21/26] added test for rentals if there are no overdue rentals --- app/controllers/customers_controller.rb | 6 +++++- test/controllers/customers_controller_test.rb | 7 ++++++- test/fixtures/rentals.yml | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 2cfd50fb5..3ecb47581 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,6 +5,10 @@ def index end def overdue rentals = Rental.where('due_date <= ?', Time.now) - render :json => rentals, status: :ok + if rentals.empty? + render 'plain text' => "There are no customers with overdue items", status: :no_content + else + render :json => rentals, status: :ok + end end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 1570b0b80..01be1ce6d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -54,8 +54,13 @@ body = JSON.parse(response.body) body.length.must_equal Rental.where('due_date <= ?', Time.now).length end + it "returns 204 error if there are no customers with overdue items" do + Rental.delete_all + get overdue_path + must_respond_with :no_content + end it "returns required fields" do - keys = %w(postal_code customer_id checkout_date due_date title name ) + keys = %w(postal_code customer_id checkout_date due_date title name) get overdue_path body = JSON.parse(response.body) body.each do |customer| diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index a77154215..bc12295d8 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,6 +1,6 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - +# # one: # movie_id: 1 # customer_id: 1 From e2744f22e8a772ad7433889a8b1e0b51bb9fb316 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Fri, 12 May 2017 12:23:43 -0700 Subject: [PATCH 22/26] changed default value for checkout count fixed negative test case for if there are no customers with overdue items --- app/controllers/customers_controller.rb | 8 ++----- ...nge_default_value_for_checked_out_count.rb | 5 +++++ db/schema.rb | 8 +++---- test/controllers/customers_controller_test.rb | 21 ++++++++++++------- 4 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 db/migrate/20170512180334_change_default_value_for_checked_out_count.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3ecb47581..1e4a79185 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,11 +4,7 @@ def index render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end def overdue - rentals = Rental.where('due_date <= ?', Time.now) - if rentals.empty? - render 'plain text' => "There are no customers with overdue items", status: :no_content - else - render :json => rentals, status: :ok - end + rentals = Rental.where("due_date <= ?", Time.now) + render :json => rentals, status: :ok end end diff --git a/db/migrate/20170512180334_change_default_value_for_checked_out_count.rb b/db/migrate/20170512180334_change_default_value_for_checked_out_count.rb new file mode 100644 index 000000000..be0c13020 --- /dev/null +++ b/db/migrate/20170512180334_change_default_value_for_checked_out_count.rb @@ -0,0 +1,5 @@ +class ChangeDefaultValueForCheckedOutCount < ActiveRecord::Migration[5.0] + def change + change_column_default(:customers, :movies_checked_out_count, 0) + end +end diff --git a/db/schema.rb b/db/schema.rb index 2c4375667..b22f4846f 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: 20170510173554) do +ActiveRecord::Schema.define(version: 20170512180334) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -27,12 +27,12 @@ t.string "registered_at" t.string "postal_code" t.string "phone" - t.integer "movies_checked_out_count" + t.integer "movies_checked_out_count", default: 0 t.string "address" t.string "city" t.string "state" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.float "account_credit" end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 01be1ce6d..c7b35f223 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -35,11 +35,15 @@ end end describe 'overdue' do + before do + Rental.create(movie_id:3, customer_id:3, checkout_date:Time.now, due_date:Time.now+2.days) + + Rental.create(movie_id:1, customer_id:1, checkout_date:Time.now-3, due_date:Time.now+1) + end it "gets overdue path" do get overdue_path must_respond_with :success end - it "returns json" do get overdue_path response.header['Content-Type'].must_include 'json' @@ -52,13 +56,9 @@ it "returns all customers with overdue items" do get overdue_path body = JSON.parse(response.body) - body.length.must_equal Rental.where('due_date <= ?', Time.now).length - end - it "returns 204 error if there are no customers with overdue items" do - Rental.delete_all - get overdue_path - must_respond_with :no_content + body.length.must_equal Rental.where("due_date <= ?", Time.now).length end + it "returns required fields" do keys = %w(postal_code customer_id checkout_date due_date title name) get overdue_path @@ -67,5 +67,12 @@ customer.keys.sort.must_equal keys end end + it "returns 204 error if there are no customers with overdue items" do + Rental.delete_all + get overdue_path + body = JSON.parse(response.body) + body.must_be_empty + + end end end From a70693476b8c096fdf93a3c519bacea174ee1891 Mon Sep 17 00:00:00 2001 From: Danielle Birbal Date: Fri, 12 May 2017 12:24:51 -0700 Subject: [PATCH 23/26] Added test + validations --- app/controllers/movies_controller.rb | 9 +- app/models/customer.rb | 6 +- app/models/movie.rb | 7 ++ app/models/rental.rb | 2 +- db/schema.rb | 2 +- test/controllers/movies_controller_test.rb | 123 +++++++++++++++++---- test/fixtures/movies.yml | 7 ++ test/models/customer_test.rb | 20 ++-- 8 files changed, 134 insertions(+), 42 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index fe5db0174..c23f342a5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,19 +18,16 @@ def checkout @movie = Movie.find_by(title: params[:title]) @customer = Customer.find_by(id: params[:customer_id]) - if Rental.find_by(movie_id: @movie.id, customer_id: @customer.id) + if Rental.find_by(movie_id: @movie.id, customer_id: @customer.id) || @movie.available_inventory == 0 render status: :bad_request else new_availability = @movie.available_inventory -= 1 - @movie.update_attribute(:available_inventory, new_availability) + customer_movie_count = @customer.movies_checked_out_count += 1 @rental = Rental.new(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Time.now, due_date: Time.now + 3.days) - if @rental.save - customer_movie_count = @customer.movies.count - @customer.update_attribute(:movies_checked_out_count, customer_movie_count) - + if @rental.save && @movie.update_attribute(:available_inventory, new_availability) && @customer.update_column(:movies_checked_out_count, customer_movie_count) render json: @rental.as_json(only: [:customer_id, :due_date]), status: :ok else render status: :bad_request diff --git a/app/models/customer.rb b/app/models/customer.rb index fc3419f2f..980ba2c65 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,6 @@ class Customer < ApplicationRecord - has_many :movies, through: :rentals - has_many :rentals + has_many :movies, through: :rentals + has_many :rentals + + validates :name, :registered_at, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index 2ad96cff8..8709eace3 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,11 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals has_many :rentals + + before_validation(on: :create) do + Movie.update_all('available_inventory = inventory') + end + + validates :title, presence: true + validates :inventory, numericality: { greater_than_or_equal_to: 0 } end diff --git a/app/models/rental.rb b/app/models/rental.rb index 8970c6883..30bc007f6 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,5 +2,5 @@ class Rental < ApplicationRecord belongs_to :movie, foreign_key: 'movie_id' belongs_to :customer, foreign_key: 'customer_id' - + validates :movie_id, :customer_id, :checkout_date, :due_date, presence: true end diff --git a/db/schema.rb b/db/schema.rb index b22f4846f..437b9b756 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -47,7 +47,7 @@ end create_table "rentals", force: :cascade do |t| - t.string "movie_id" + t.integer "movie_id" t.integer "customer_id" t.datetime "checkout_date" t.datetime "due_date" diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c97592c42..b70863a59 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -58,42 +58,121 @@ end describe 'checkout' do - it 'can checkout a movie' do - test_customer = customers(:one) - test_movie = movies(:one) + it 'can checkout a movie and update movies and customers' do + movie_inventory = movies(:one).available_inventory - 1 + customer_movies = customers(:one).movies.length + 1 - movie_inventory = test_movie.available_inventory - 1 - customer_movies = test_customer.movies.length + 1 - - post checkout_path(customer_id: test_customer.id, title: test_movie.title) + post checkout_path(customer_id: customers(:one).id, title: movies(:one).title) must_respond_with :success - test_movie.reload + movies(:one).reload + + movies(:one).available_inventory.must_equal movie_inventory + customers(:one).movies.count.must_equal customer_movies + end + + it 'wont allow a customer to checkout the same movie twice' do + post checkout_path(customer_id: customers(:one).id, title: movies(:one).title) + customer_movies = customers(:one).movies.count + + post checkout_path(customer_id: customers(:one).id, title: movies(:one).title) + must_respond_with :bad_request + + customers(:one).movies.count.must_equal customer_movies + end + + it 'wont allow customer to checkout if no available inventory' do + post checkout_path(customer_id: customers(:one).id, title: movies(:three).title) + + post checkout_path(customer_id: customers(:two).id, title: movies(:three).title) + customers(:two).movies.count.must_equal 0 + end + + it 'creates a Rental if valid' do + first_rental_count = Rental.count + + post checkout_path(customer_id: customers(:one).id, title: movies(:one).title) - test_movie.available_inventory.must_equal movie_inventory - test_customer.movies.count.must_equal customer_movies + Rental.count.must_equal first_rental_count + 1 + end + + it 'returns json' do + post checkout_path(customer_id: customers(:one).id, title: movies(:one).title) + response.header['Content-Type'].must_include 'json' + end + + it 'returns a Hash' do + post checkout_path(customer_id: customers(:one).id, title: movies(:one).title) + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it 'returns rental with exactly the required fields' do + keys = %w(customer_id due_date) + post checkout_path(customer_id: customers(:one).id, title: movies(:one).title) + + body = JSON.parse(response.body) + body.keys.sort.must_equal keys end end describe 'checkin' do + before do + @movie_inventory = movies(:one).available_inventory + @customer_movies = customers(:one).movies.length + post checkout_path(customer_id: customers(:one).id, title: movies(:one).title) + end it 'can checkin a movie' do - test_customer = customers(:one) - test_movie = movies(:one) + movies(:one).reload + movies(:one).available_inventory.wont_equal @movie_inventory + + post checkin_path(customer_id: customers(:one).id, title: movies(:one).title) + must_respond_with :success - movie_inventory = test_movie.available_inventory - customer_movies = test_customer.movies.length + movies(:one).reload - post checkout_path(customer_id: test_customer.id, title: test_movie.title) - test_movie.reload - test_movie.available_inventory.wont_equal movie_inventory + movies(:one).available_inventory.must_equal @movie_inventory + customers(:one).movies.count.must_equal @customer_movies + end - post checkin_path(customer_id: test_customer.id, title: test_movie.title) - must_respond_with :success + it 'wont allow a customer to checkin the same movie twice' do + post checkin_path(customer_id: customers(:one).id, title: movies(:one).title) + customer_movies = customers(:one).movies.count - test_movie.reload + post checkin_path(customer_id: customers(:one).id, title: movies(:one).title) + must_respond_with :bad_request + + customers(:one).movies.count.must_equal customer_movies + end + + it 'destroys a Rental if valid' do + first_rental_count = Rental.count + + post checkin_path(customer_id: customers(:one).id, title: movies(:one).title) + + Rental.count.must_equal first_rental_count - 1 + end - test_movie.available_inventory.must_equal movie_inventory - test_customer.movies.count.must_equal customer_movies + it 'returns json' do + post checkin_path(customer_id: customers(:one).id, title: movies(:one).title) + response.header['Content-Type'].must_include 'json' + end + + it 'returns a Hash' do + post checkin_path(customer_id: customers(:one).id, title: movies(:one).title) + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it 'returns rental with exactly the required fields' do + keys = %w(customer_id) + post checkout_path(customer_id: customers(:one).id, title: movies(:one).title) + post checkin_path(customer_id: customers(:one).id, title: movies(:one).title) + + body = JSON.parse(response.body) + body.keys.sort.must_equal keys end end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index aee46a6a9..763165254 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -13,3 +13,10 @@ two: overview: She's back, and she's FLUFFIER inventory: 5 available_inventory: 1 + +three: + title: Tofu and Toffee + release_date: 2017-01-05 + overview: Woof Woof Wooof wooooooooooooo + inventory: 1 + available_inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 28fa24e60..521199cb2 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,14 +1,14 @@ -require "test_helper" +require 'test_helper' describe Customer do - describe "associations/relation" do - it "has many through movies" do - ar = Customer.reflect_on_association(:movies) - ar.macro.must_equal :has_many + describe 'associations/relation' do + it 'has many movies through rentals' do + ar = Customer.reflect_on_association(:movies) + ar.macro.must_equal :has_many + end + it 'has many rentals' do + ar = Customer.reflect_on_association(:rentals) + ar.macro.must_equal :has_many + end end - it "has many rentals" do - ar = Customer.reflect_on_association(:rentals) - ar.macro.must_equal :has_many - end - end end From ee04348fac16251800644eb6f06e86316048fc94 Mon Sep 17 00:00:00 2001 From: Danielle Birbal Date: Fri, 12 May 2017 12:55:30 -0700 Subject: [PATCH 24/26] Tests for validations --- test/models/customer_test.rb | 17 ++++++++++++ test/models/movie_test.rb | 34 ++++++++++++++++++++--- test/models/rental_test.rb | 52 +++++++++++++++++++++++++++++------- 3 files changed, 90 insertions(+), 13 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 521199cb2..3b8ef6618 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -11,4 +11,21 @@ ar.macro.must_equal :has_many end end + + describe 'validations' do + it 'is invalid without a name' do + customer = Customer.new(registered_at: '2017-5-19') + result = customer.valid? + result.must_equal false + + customer.errors.messages.must_include :name + end + it 'is invalid without registration date' do + customer = Customer.new(name: 'Tofu') + result = customer.valid? + result.must_equal false + + customer.errors.messages.must_include :registered_at + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index a62ca1ba0..0ac7166f5 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,13 +2,39 @@ describe Movie do describe 'associations/relation' do - it 'has many movies' do + it 'has many customers' do ar = Movie.reflect_on_association(:customers) ar.macro.must_equal :has_many end - it "has many rentals" do - ar = Movie.reflect_on_association(:rentals) - ar.macro.must_equal :has_many + it 'has many rentals' do + ar = Movie.reflect_on_association(:rentals) + ar.macro.must_equal :has_many + end + end + + describe 'validations' do + it 'is invalid without a title' do + movie = Movie.new + result = movie.valid? + result.must_equal false + + movie.errors.messages.must_include :title + end + + it 'wont allow inventory to be less than 0' do + movie = Movie.new(title: 'Tofu the Fluff', inventory: -1) + result = movie.valid? + result.must_equal false + + movie.errors.messages.must_include :inventory + end + + it 'only allows numbers for inventory' do + movie = Movie.new(title: 'Tofu the Fluff', inventory: 'pizza') + result = movie.valid? + result.must_equal false + + movie.errors.messages.must_include :inventory end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 82f11d4da..865d9f604 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,14 +1,48 @@ require 'test_helper' describe Rental do - describe 'associations/relation' do - it 'belongs to customers' do - ar = Rental.reflect_on_association(:customer) - ar.macro.must_equal :belongs_to - end - it 'belongs to movies' do - ar = Rental.reflect_on_association(:movie) - ar.macro.must_equal :belongs_to - end + describe 'associations/relation' do + it 'belongs to customers' do + ar = Rental.reflect_on_association(:customer) + ar.macro.must_equal :belongs_to + end + it 'belongs to movies' do + ar = Rental.reflect_on_association(:movie) + ar.macro.must_equal :belongs_to + end + end + + describe 'validations' do + it 'is invalid without a movie id' do + rental = Rental.new(customer_id: 1, checkout_date: Time.now, due_date: Time.now + 3) + result = rental.valid? + result.must_equal false + + rental.errors.messages.must_include :movie_id + end + + it 'is invalid without a customer id' do + rental = Rental.new(movie_id: 1, checkout_date: Time.now, due_date: Time.now + 3) + result = rental.valid? + result.must_equal false + + rental.errors.messages.must_include :customer_id + end + + it 'is invalid without a checkout date' do + rental = Rental.new(customer_id: 1, movie_id: 2, due_date: Time.now + 3) + result = rental.valid? + result.must_equal false + + rental.errors.messages.must_include :checkout_date + end + + it 'is invalid without a due date' do + rental = Rental.new(customer_id: 1, checkout_date: Time.now, movie_id: 3) + result = rental.valid? + result.must_equal false + + rental.errors.messages.must_include :due_date + end end end From acdc4acc05f7dbcb25e73dc09e1ffe2f509c10f2 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Fri, 12 May 2017 14:34:02 -0700 Subject: [PATCH 25/26] added error reports to movies and customers controller --- app/controllers/customers_controller.rb | 8 ++- app/controllers/movies_controller.rb | 82 +++++++++++++------------ 2 files changed, 49 insertions(+), 41 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1e4a79185..e2d8b6e12 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,11 @@ class CustomersController < ApplicationController def index - customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + @customers = Customer.all + if @customers.empty? + render json: { error: "No customers found" }, status: :not_found + else + render json: @customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + end end def overdue rentals = Rental.where("due_date <= ?", Time.now) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c23f342a5..86e35d362 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,57 +1,61 @@ class MoviesController < ApplicationController - def index - @movies = Movie.all - render json: @movies.as_json(only: [:id, :title, :release_date]), status: :ok + def index + @movies = Movie.all + if @movies.empty? + render json: { error: "No movies are found" }, status: :not_found + else + render json: @movies.as_json(only: [:id, :title, :release_date]), status: :ok end + end - def show - @movie = Movie.find_by(title: params[:title]) + def show + @movie = Movie.find_by(title: params[:title]) - if @movie.nil? - render json: {}, status: :not_found - else - render json: @movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok - end + if @movie.nil? + render json: { error: "Movie with title #{params[:title]} not found." }, status: :not_found + else + render json: @movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok end + end - def checkout - @movie = Movie.find_by(title: params[:title]) - @customer = Customer.find_by(id: params[:customer_id]) + def checkout + @movie = Movie.find_by(title: params[:title]) + @customer = Customer.find_by(id: params[:customer_id]) - if Rental.find_by(movie_id: @movie.id, customer_id: @customer.id) || @movie.available_inventory == 0 - render status: :bad_request - else + if Rental.find_by(movie_id: @movie.id, customer_id: @customer.id) || @movie.available_inventory == 0 + render status: :bad_request + else - new_availability = @movie.available_inventory -= 1 - customer_movie_count = @customer.movies_checked_out_count += 1 + new_availability = @movie.available_inventory -= 1 + customer_movie_count = @customer.movies_checked_out_count += 1 - @rental = Rental.new(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Time.now, due_date: Time.now + 3.days) + @rental = Rental.new(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Time.now, due_date: Time.now + 3.days) - if @rental.save && @movie.update_attribute(:available_inventory, new_availability) && @customer.update_column(:movies_checked_out_count, customer_movie_count) - render json: @rental.as_json(only: [:customer_id, :due_date]), status: :ok - else - render status: :bad_request - end - end + if @rental.save && @movie.update_attribute(:available_inventory, new_availability) && @customer.update_column(:movies_checked_out_count, customer_movie_count) + render json: @rental.as_json(only: [:customer_id, :due_date]), status: :ok + else + render status: :bad_request + end end + end - def checkin - @movie = Movie.find_by(title: params[:title]) - @customer = Customer.find_by(id: params[:customer_id]) - @rental = Rental.find_by(movie_id: @movie.id, customer_id: @customer.id) + def checkin + @movie = Movie.find_by(title: params[:title]) + @customer = Customer.find_by(id: params[:customer_id]) + @rental = Rental.find_by(movie_id: @movie.id, customer_id: @customer.id) - if @customer.movies.any? { |movie| movie.title == @movie.title } - new_availability = @movie.available_inventory += 1 - @movie.update_attribute(:available_inventory, new_availability) + if @customer.movies.any? { |movie| movie.title == @movie.title } + new_availability = @movie.available_inventory += 1 + @movie.update_attribute(:available_inventory, new_availability) - render json: @rental.as_json(only: [:customer_id]), status: :ok - @rental.destroy + render json: @rental.as_json(only: [:customer_id]), status: :ok + @rental.destroy - customer_movie_count = @customer.movies.count - @customer.update_attribute(:movies_checked_out_count, customer_movie_count) + customer_movie_count = @customer.movies.count + @customer.update_attribute(:movies_checked_out_count, customer_movie_count) - else - render status: :bad_request - end + else + render status: :bad_request end + end end From 72230a9632914c4d17d76679f9a0086ae5db4909 Mon Sep 17 00:00:00 2001 From: Marisol Lopez Date: Fri, 12 May 2017 14:57:44 -0700 Subject: [PATCH 26/26] changed checkout and checkin routes --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index cfef306b3..d262f6973 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,7 @@ get '/rentals/overdue', to: 'customers#overdue', as: 'overdue' - post '/movies/:title/check-out', to: 'movies#checkout', as: 'checkout' - post '/movies/:title/check-in', to: 'movies#checkin', as: 'checkin' + post '/rentals/:title/check-out', to: 'movies#checkout', as: 'checkout' + post '/rentals/:title/check-in', to: 'movies#checkin', as: 'checkin' end