From 475bd3b24828e1d6d52c538647e4cb3b256ed45c Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Mon, 7 May 2018 11:42:26 -0700 Subject: [PATCH 01/57] created rails app in VideoStoreAPI --- .gitignore | 16 + Gemfile | 50 +++ Gemfile.lock | 154 +++++++++ README.md | 312 +----------------- Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 35 ++ bin/spring | 17 + bin/update | 29 ++ config.ru | 5 + config/application.rb | 40 +++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 85 +++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++ config/environments/production.rb | 83 +++++ config/environments/test.rb | 42 +++ .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 ++ config/puma.rb | 56 ++++ config/routes.rb | 3 + config/secrets.yml | 32 ++ config/spring.rb | 6 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 26 ++ tmp/.keep | 0 vendor/.keep | 0 54 files changed, 920 insertions(+), 299 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/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..68ac019ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..78bff8d26 --- /dev/null +++ b/Gemfile @@ -0,0 +1,50 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.6' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..e547d2449 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,154 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.6) + actionpack (= 5.1.6) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.6) + activesupport (= 5.1.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.6) + activesupport (= 5.1.6) + globalid (>= 0.3.6) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) + arel (~> 8.0) + activesupport (5.1.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.23) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.3.1) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.11.4) + rack (2.0.5) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) + bundler (>= 1.3.0) + railties (= 5.1.6) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.7) + rails (~> 5.1.6) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.16.1 diff --git a/README.md b/README.md index 59f4e3757..7db80e4ca 100644 --- a/README.md +++ b/README.md @@ -1,310 +1,24 @@ -# Project: VideoStoreAPI +# README -**Due:** EOD Friday May 11 +This README would normally document whatever steps are necessary to get the +application up and running. -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. +Things you may want to cover: -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. +* Ruby version -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. +* System dependencies -## Learning Goals -Upon completing this project, students should be able to: +* Configuration -- 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 +* Database creation -This is a [stage 2](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) project. +* Database initialization -## Success Criteria -Your project will be evaluated against the following requirements: +* How to run the test suite -- 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 - - Everything we've learned so far about how to design and build a Rails app still applies! +* Services (job queues, cache servers, search engines, etc.) -## 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!" +* Deployment instructions -## 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 - -In the past, many students have spent lots of time writing and testing validations for these models. Because project time is limited and validations are not an important learning objective this week, we do not recommend this. Instead, validate only those fields that, if they are absent, will break your API. - -### 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: - -| Field | Datatype | Description -|----------------|----------|------------ -| `title` | string | The title of the film -| `overview` | string | A short plot synopsis -| `release_date` | date | `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` | datetime | `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 and 3: 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. You will notice they are in the format `{{url}}/movies`. `{{url}}` is a key which you can give a value on your computer. -1. To do so go to the Gearbox in the top-right and select `Manage Environments` -![Manage Environments](images/manage-environment.png) -1. Then Select `Add` -![add button](images/add-btn.png) -1. Lastly add a key `url` and value `http://localhost:3000` -![Key & Value](images/key-value.png) -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 - -### Wave 2: Customers and Movies - -#### `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: -- `id` -- `title` -- `release_date` - -#### `GET /movies/:id` -Look a movie up by `id` - -URI parameters: -- `id`: Movie identifier - -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. - -#### `POST /movies` -Create a new movie in the video store inventory. - -Upon success, this request should return the `id` of the movie created. - -Request body: - -| Field | Datatype | Description -|---------------|---------------------|------------ -| `title` | string | Title of the movie -| `overview` | string | Descriptive summary of the movie -| `release_date` | string `YYYY-MM-DD` | Date the movie was released -| `inventory` | integer | Quantity available in the video store - -### Wave 3: Rentals - -Wave 2 focused on working with customers and movies. With these endpoints you can extend the functionality of your API to allow managing the rental process. - -#### `POST /rentals/check-out` -Check out one of the movie's inventory to the customer. The rental's check-out date should be set to today, and the due date should be set to a week from today. - -**Note:** Some of the fields from wave 2 should now have interesting values. Good thing you wrote tests for them, right... right? - -Request body: - -| Field | Datatype | Description -|---------------|---------------------|------------ -| `customer_id` | integer | ID of the customer checking out this film -| `movie_id` | integer | ID of the movie to be checked out - -#### `POST /rentals/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 -| `movie_id` | integer | ID of the movie to be checked in - -## Optional Enhancements -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 /rentals/overdue` -List all customers with overdue movies - -Fields to return: -- `movie_id` -- `title` -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /movies/:id/current` -List customers that have _currently_ checked out a copy of the film - -URI parameters: -- `id`: Movie identifier - -Fields to return: -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /movies/:id/history` -List customers that have checked out a copy of the film _in the past_ - -URI parameters: -- `id`: Movie identifier - -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) - -## What We're Looking For - -Check the [feedback template](./feedback.md) to see how we will evaluate your project. +* ... diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..104e40c1c --- /dev/null +++ b/bin/setup @@ -0,0 +1,35 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..2fe7718ea --- /dev/null +++ b/config/application.rb @@ -0,0 +1,40 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..ad59bcd88 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: VideoStoreAPI_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..abc82221c --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..3bd8115ea --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,83 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..8e5cbde53 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..f54df191b --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: 1b102400abcc5c84c4cd1411c2ffb73967b8542856bf75a0cb61194b92f7c7d743f757a3c2c6779e9aee016f7ee7c19a99062b1eb87f2e6bf070ea7ded2905cf + +test: + secret_key_base: b3ccfb55b6ef5c8a16462c741b59e61e0b76e04abeee359d83e9354be908f94f3a6e561669d14e94d66356b17f3015341f65914696544df20b4133800c18cdd8 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From bb9d6cb36b5171584249578002640e4defb0d3af Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 12:43:02 -0700 Subject: [PATCH 02/57] restores readme file --- README.md | 312 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 299 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 7db80e4ca..59f4e3757 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,310 @@ -# README +# Project: VideoStoreAPI -This README would normally document whatever steps are necessary to get the -application up and running. +**Due:** EOD Friday May 11 -Things you may want to cover: +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. -* Ruby version +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. -* System dependencies +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. -* Configuration +## Learning Goals +Upon completing this project, students should be able to: -* Database creation +- 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 -* Database initialization +This is a [stage 2](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) project. -* How to run the test suite +## Success Criteria +Your project will be evaluated against the following requirements: -* Services (job queues, cache servers, search engines, etc.) +- 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 + - Everything we've learned so far about how to design and build a Rails app still applies! -* Deployment instructions +## 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!" -* ... +## 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 + +In the past, many students have spent lots of time writing and testing validations for these models. Because project time is limited and validations are not an important learning objective this week, we do not recommend this. Instead, validate only those fields that, if they are absent, will break your API. + +### 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: + +| Field | Datatype | Description +|----------------|----------|------------ +| `title` | string | The title of the film +| `overview` | string | A short plot synopsis +| `release_date` | date | `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` | datetime | `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 and 3: 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. You will notice they are in the format `{{url}}/movies`. `{{url}}` is a key which you can give a value on your computer. +1. To do so go to the Gearbox in the top-right and select `Manage Environments` +![Manage Environments](images/manage-environment.png) +1. Then Select `Add` +![add button](images/add-btn.png) +1. Lastly add a key `url` and value `http://localhost:3000` +![Key & Value](images/key-value.png) +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 + +### Wave 2: Customers and Movies + +#### `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: +- `id` +- `title` +- `release_date` + +#### `GET /movies/:id` +Look a movie up by `id` + +URI parameters: +- `id`: Movie identifier + +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. + +#### `POST /movies` +Create a new movie in the video store inventory. + +Upon success, this request should return the `id` of the movie created. + +Request body: + +| Field | Datatype | Description +|---------------|---------------------|------------ +| `title` | string | Title of the movie +| `overview` | string | Descriptive summary of the movie +| `release_date` | string `YYYY-MM-DD` | Date the movie was released +| `inventory` | integer | Quantity available in the video store + +### Wave 3: Rentals + +Wave 2 focused on working with customers and movies. With these endpoints you can extend the functionality of your API to allow managing the rental process. + +#### `POST /rentals/check-out` +Check out one of the movie's inventory to the customer. The rental's check-out date should be set to today, and the due date should be set to a week from today. + +**Note:** Some of the fields from wave 2 should now have interesting values. Good thing you wrote tests for them, right... right? + +Request body: + +| Field | Datatype | Description +|---------------|---------------------|------------ +| `customer_id` | integer | ID of the customer checking out this film +| `movie_id` | integer | ID of the movie to be checked out + +#### `POST /rentals/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 +| `movie_id` | integer | ID of the movie to be checked in + +## Optional Enhancements +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 /rentals/overdue` +List all customers with overdue movies + +Fields to return: +- `movie_id` +- `title` +- `customer_id` +- `name` +- `postal_code` +- `checkout_date` +- `due_date` + +#### `GET /movies/:id/current` +List customers that have _currently_ checked out a copy of the film + +URI parameters: +- `id`: Movie identifier + +Fields to return: +- `customer_id` +- `name` +- `postal_code` +- `checkout_date` +- `due_date` + +#### `GET /movies/:id/history` +List customers that have checked out a copy of the film _in the past_ + +URI parameters: +- `id`: Movie identifier + +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) + +## What We're Looking For + +Check the [feedback template](./feedback.md) to see how we will evaluate your project. From 83d1c4041b7884def17e17d59120c7a5a7806d80 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Mon, 7 May 2018 14:39:42 -0700 Subject: [PATCH 03/57] create movie, customer, and rental models --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ db/migrate/20180507213120_create_customers.rb | 15 +++++++++++++++ db/migrate/20180507213203_create_movies.rb | 12 ++++++++++++ db/migrate/20180507213911_create_rentals.rb | 11 +++++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/fixtures/rentals.yml | 11 +++++++++++ test/models/customer_test.rb | 9 +++++++++ test/models/movie_test.rb | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 12 files changed, 114 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20180507213120_create_customers.rb create mode 100644 db/migrate/20180507213203_create_movies.rb create mode 100644 db/migrate/20180507213911_create_rentals.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/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/20180507213120_create_customers.rb b/db/migrate/20180507213120_create_customers.rb new file mode 100644 index 000000000..23316d24a --- /dev/null +++ b/db/migrate/20180507213120_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20180507213203_create_movies.rb b/db/migrate/20180507213203_create_movies.rb new file mode 100644 index 000000000..62885a98f --- /dev/null +++ b/db/migrate/20180507213203_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20180507213911_create_rentals.rb b/db/migrate/20180507213911_create_rentals.rb new file mode 100644 index 000000000..5455cf14f --- /dev/null +++ b/db/migrate/20180507213911_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.date :checkout_date + t.date :due_date + t.boolean :returned? + + t.timestamps + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..468ae1b8f --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2018-05-07 14:31:20 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-05-07 14:31:20 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..090b19e62 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2018-05-07 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-05-07 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..06ebf1a3b --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: 2018-05-07 + due_date: 2018-05-07 + returned?: false + +two: + checkout_date: 2018-05-07 + due_date: 2018-05-07 + returned?: false diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/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 adc82a35ba2846a152784c98f4b55d066f23ca3f Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 15:42:03 -0700 Subject: [PATCH 04/57] adds customer, movie, and rental models with relationships and validations --- app/models/customer.rb | 3 +++ app/models/movie.rb | 4 ++++ app/models/rental.rb | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..ee1f6d755 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,5 @@ class Customer < ApplicationRecord + has_many :rentals, dependent: :destroy + + validates_presence_of :name, :registered_at end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..10dabca52 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals, dependent: :destroy + + validates :title, presence: true + validates :inventory, presence: true, numericality: true end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..78b0f18e1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,6 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + + validates :checkout_date, presence: true end From fdeafbf7542a3e44708ef1c2e024a447bc999c80 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 15:44:48 -0700 Subject: [PATCH 05/57] schema file --- db/schema.rb | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..9a1301831 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,47 @@ +# 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: 20180507213911) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.date "due_date" + t.boolean "returned?" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From c9ec2e6ca75e15e57d5e699f5ebfaf0c733ece6b Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 15:50:10 -0700 Subject: [PATCH 06/57] adds foreign keys migration to rentals model --- db/migrate/20180507224722_add_foreign_keys_to_rental.rb | 6 ++++++ db/schema.rb | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180507224722_add_foreign_keys_to_rental.rb diff --git a/db/migrate/20180507224722_add_foreign_keys_to_rental.rb b/db/migrate/20180507224722_add_foreign_keys_to_rental.rb new file mode 100644 index 000000000..d6c4116fb --- /dev/null +++ b/db/migrate/20180507224722_add_foreign_keys_to_rental.rb @@ -0,0 +1,6 @@ +class AddForeignKeysToRental < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 9a1301831..f83b00327 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: 20180507213911) do +ActiveRecord::Schema.define(version: 20180507224722) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,6 +42,12 @@ t.boolean "returned?" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From f7c73cb978395b0ea4c08e298c602361d6175d62 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Mon, 7 May 2018 16:08:10 -0700 Subject: [PATCH 07/57] added fixtures to movie --- test/fixtures/movies.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 090b19e62..732c002f7 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString +Babe: + title: "Babe" + overview: "The Gallant Pig" release_date: 2018-05-07 - inventory: 1 + inventory: 3 -two: - title: MyString - overview: MyString +Keanu: + title: Keanu + overview: "Two friends look for a lost kitten" release_date: 2018-05-07 inventory: 1 From e8686cf3f14ddbec85e4e27b305cfc36f9187b6c Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 16:22:41 -0700 Subject: [PATCH 08/57] adds model tests for Customer. edits customer and rental yml fixtures --- test/fixtures/customers.yml | 8 ++++---- test/fixtures/rentals.yml | 12 ++++++++---- test/models/customer_test.rb | 35 +++++++++++++++++++++++++++++++++-- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 468ae1b8f..cdf61f83b 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +nora: + name: Nora registered_at: 2018-05-07 14:31:20 address: MyString city: MyString @@ -9,8 +9,8 @@ one: postal_code: MyString phone: MyString -two: - name: MyString +sara: + name: Sara registered_at: 2018-05-07 14:31:20 address: MyString city: MyString diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 06ebf1a3b..cd11a37f7 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,11 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +rental_one: + customer: nora + movie: Babe checkout_date: 2018-05-07 - due_date: 2018-05-07 + due_date: 2018-05-17 returned?: false -two: +rental_two: + customer: sara + movie: Keanu checkout_date: 2018-05-07 - due_date: 2018-05-07 + due_date: 2018-05-17 returned?: false diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..c460baa1e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,8 +2,39 @@ describe Customer do let(:customer) { Customer.new } + let(:nora) { customers(:nora) } + let(:sara) { customers(:sara) } - it "must be valid" do - value(customer).must_be :valid? + describe "validations" do + it "must be valid" do + nora.valid?.must_equal true + end + + it "requires a name" do + sara.name = nil + sara.valid?.must_equal false + end + + it "requires a registered_at date" do + bob = Customer.new(name: "Bob", registered_at: "today") + bob.valid?.must_equal false + end + end + + describe "relations" do + it "has a list of rentals" do + nora.must_respond_to :rentals + nora.rentals.count.must_equal 1 + nora.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end end + + describe "movies_checked_out_count" do + it "returns the number of movies a customer has checked out" do + sara.movies_checked_out_count.must_equal 1 + end + end + end From a7a1af98e13681a84aed3f7802cf45f5d339cc02 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Mon, 7 May 2018 16:28:22 -0700 Subject: [PATCH 09/57] corrected letter case on yml files --- test/fixtures/movies.yml | 10 +++++----- test/fixtures/rentals.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 732c002f7..cb6562b2e 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -Babe: - title: "Babe" - overview: "The Gallant Pig" +babe: + title: Babe + overview: The Gallant Pig release_date: 2018-05-07 inventory: 3 -Keanu: +keanu: title: Keanu - overview: "Two friends look for a lost kitten" + overview: Two friends look for a lost kitten release_date: 2018-05-07 inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index cd11a37f7..96296b376 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -2,14 +2,14 @@ rental_one: customer: nora - movie: Babe + movie: babe checkout_date: 2018-05-07 due_date: 2018-05-17 returned?: false rental_two: customer: sara - movie: Keanu + movie: keanu checkout_date: 2018-05-07 due_date: 2018-05-17 returned?: false From bcf0f89e20372e54f57f225194ba6474838d8ba8 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Mon, 7 May 2018 16:39:56 -0700 Subject: [PATCH 10/57] update db schema --- db/schema.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index f83b00327..9a1301831 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: 20180507224722) do +ActiveRecord::Schema.define(version: 20180507213911) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,12 +42,6 @@ t.boolean "returned?" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.bigint "customer_id" - t.bigint "movie_id" - t.index ["customer_id"], name: "index_rentals_on_customer_id" - t.index ["movie_id"], name: "index_rentals_on_movie_id" end - add_foreign_key "rentals", "customers" - add_foreign_key "rentals", "movies" end From 686d410beccab5465f6a3c25ccaf8c7cbba946a5 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 16:41:48 -0700 Subject: [PATCH 11/57] minor add to Customer test --- test/models/customer_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index c460baa1e..6f071eddb 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -28,6 +28,7 @@ nora.rentals.each do |rental| rental.must_be_kind_of Rental end + nora.rentals.first.movie.title.must_equal "Babe" end end From 1e5fc039dfacddcfb9a7f48277aeb9d90cea4443 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 16:42:21 -0700 Subject: [PATCH 12/57] adds tests for Rental model --- test/models/rental_test.rb | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..0877ff92d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,8 +2,39 @@ describe Rental do let(:rental) { Rental.new } + let(:rental_one) { rentals(:rental_one) } + let(:rental_two) { rentals(:rental_two) } - it "must be valid" do - value(rental).must_be :valid? + describe "validations" do + + it "must be valid" do + rental_one.valid?.must_equal true + end + + it "requires a checkout_date" do + rental_two.checkout_date = nil + rental_two.valid?.must_equal false + end + + end + + describe "relations" do + it "must have a customer" do + rental_one.must_respond_to :customer + rental_one.customer.must_be_kind_of Customer + rental_one.customer.name.must_equal "Nora" + rental_two.must_respond_to :customer + rental_two.customer.must_be_kind_of Customer + rental_two.customer.name.must_equal "Sara" + end + + it "must have a movie" do + rental_one.must_respond_to :movie + rental_one.movie.must_be_kind_of Movie + rental_one.movie.title.must_equal "Babe" + rental_two.must_respond_to :movie + rental_two.movie.must_be_kind_of Movie + rental_two.movie.title.must_equal "Keanu" + end end end From ec05c56ea3550c00203b91ed3718d7c272069497 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Mon, 7 May 2018 16:45:28 -0700 Subject: [PATCH 13/57] create movie model test --- app/models/movie.rb | 5 ++++ db/schema.rb | 8 ++++++- test/models/movie_test.rb | 48 ++++++++++++++++++++++++++++++++++++--- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 10dabca52..4b99e43ed 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,9 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, presence: true, numericality: true + + def available_inventory + + end + end diff --git a/db/schema.rb b/db/schema.rb index 9a1301831..f83b00327 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: 20180507213911) do +ActiveRecord::Schema.define(version: 20180507224722) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,6 +42,12 @@ t.boolean "returned?" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..0a63f9887 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,8 +2,50 @@ describe Movie do let(:movie) { Movie.new } + let(:babe) { movies(:babe) } + let(:keanu) { movies(:keanu) } + let(:rental) { Rental.new } + # let(:rental_one) { rentals(:rental_one) } + # let(:rental_two) { rentals(:rental_two) } + + describe 'valid' do + it "must be valid" do + babe.valid?.must_equal true + end + + it "is invalid with nil title" do + babe.title = nil + babe.valid?.must_equal false + babe.errors.messages.must_include :title + end + + it "is invalid with a nil inventory" do + keanu.inventory = nil + keanu.valid?.must_equal false + keanu.errors.messages.must_include :inventory + end + + it "is invalid with an inventory that is not an integer" do + babe.inventory = "string" + babe.valid?.must_equal false + babe.errors.messages.must_include :inventory + end + end + + describe 'relations' do + it "responds to rentals" do + babe.must_respond_to :rentals + babe.rentals.count.must_equal 1 + babe.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + end + + describe "inventory" do + it "returns the available inventory" do + babe.available_inventory.must_equal 2 + end + end - it "must be valid" do - value(movie).must_be :valid? end -end From 7e4444dfe9ac704f47768344f10b961d4549081a Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 16:51:37 -0700 Subject: [PATCH 14/57] generates customers, movies and rentals controllers and default routes --- app/controllers/customers_controller.rb | 4 ++++ app/controllers/movies_controller.rb | 10 ++++++++++ app/controllers/rentals_controller.rb | 7 +++++++ config/routes.rb | 12 ++++++++++++ test/controllers/customers_controller_test.rb | 9 +++++++++ test/controllers/movies_controller_test.rb | 19 +++++++++++++++++++ test/controllers/rentals_controller_test.rb | 14 ++++++++++++++ 7 files changed, 75 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..73302240c --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..b69241e5f --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,10 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..012699722 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,7 @@ +class RentalsController < ApplicationController + def checkout + end + + def checkin + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..ea836cb88 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,15 @@ Rails.application.routes.draw do + get 'rentals/checkout' + + get 'rentals/checkin' + + get 'movies/index' + + get 'movies/show' + + get 'movies/create' + + get 'customers/index' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..c5ec6f20b --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..53607f49d --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + + it "should get create" do + get movies_create_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..da64a7a36 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe RentalsController do + it "should get checkout" do + get rentals_checkout_url + value(response).must_be :success? + end + + it "should get checkin" do + get rentals_checkin_url + value(response).must_be :success? + end + +end From fb2a7bb71e20280532e04d508c2fddb8d4eb0219 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 17:00:18 -0700 Subject: [PATCH 15/57] adds routes for movies index, show, create, and customer index --- config/routes.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index ea836cb88..c6bb85d57 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,15 +1,9 @@ Rails.application.routes.draw do - get 'rentals/checkout' - get 'rentals/checkin' - - get 'movies/index' - - get 'movies/show' - - get 'movies/create' - - get 'customers/index' + get '/customers', to: 'customers#index', as: 'customers' + get '/movies', to: 'movies#index', as: 'movies' + get '/movie/:id', to: 'movies#show', as: 'movie' + post '/movies', to: 'movies#create', as: 'new_movie' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 78ac4a6f04f8b6ae51bed3ad10d603c8e46239ed Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 17:09:14 -0700 Subject: [PATCH 16/57] adds tests for customers#index --- test/controllers/customers_controller_test.rb | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5ec6f20b..e4a47db84 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,42 @@ require "test_helper" describe CustomersController do - it "should get index" do - get customers_index_url - value(response).must_be :success? + + describe "index" do + # These tests are a little verbose - yours do not need to be + # this explicit. + it "is a real working route" do + get customers_url + must_respond_with :success + end + + it "returns json" do + get customers_url + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + get customers_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_url + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(name registered_at address city state postal_code phone) + get customers_url + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end end end From 2e69af49413d5d2e16ea5a8b86afef20665cd49f Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Mon, 7 May 2018 17:14:36 -0700 Subject: [PATCH 17/57] updates customers#index test --- test/controllers/customers_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index e4a47db84..93d7c349f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -30,7 +30,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(name registered_at address city state postal_code phone) + keys = %w(id name registered_at postal_code phone movies_checked_out_count) get customers_url body = JSON.parse(response.body) body.each do |customer| From 7dac99b6c6f868b87317f92e16aa5d0300aa55f4 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Mon, 7 May 2018 17:29:28 -0700 Subject: [PATCH 18/57] added controller tests --- test/controllers/movies_controller_test.rb | 84 +++++++++++++++++++--- 1 file changed, 75 insertions(+), 9 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..4aca9e818 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,19 +1,85 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? + + describe "index" do + it "is a real working route" do + get movies_url + must_respond_with :success + end + + it "returns json" do + get movies_url + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + get movies_url + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_url + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + keys = %w(id title release_date) + get movies_url + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end end - it "should get show" do - get movies_show_url - value(response).must_be :success? + describe "show" do + it "can get a movie" do + get movie_path(movies(:babe).id) + must_respond_with :success + end + + it "returns a 404 for movies that are not found" do + movie = movies(:babe) + movie.destroy + get movie_path(movie.id) + must_respond_with :not_found + end end - it "should get create" do - get movies_create_url - value(response).must_be :success? + describe "create" do + let(:movie_data) { + { + title: "Free Willy", + release_date: Date.today, + overview: "Whale movie", + inventory: 3 + } + } + + let(:bad_movie_data) { + { + release_date: Date.today, + inventory: 3 + } + } + + it "creates a new movie" do + proc { + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count', 1 + must_respond_with :success + end + + it "returns a bad request for a bad params data" do + proc { + post movies_path, params: {movie: bad_movie_data} + }.must_change "Movie.count", 0 + must_respond_with :bad_request + end + end end From 7d6c989c90569dc6c8350875b6ad2c9eb4be0fb8 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Tue, 8 May 2018 10:39:39 -0700 Subject: [PATCH 19/57] create methods in customer controller --- app/controllers/customers_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..013c9daa9 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,6 @@ class CustomersController < ApplicationController def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 93d7c349f..b4f83dde2 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -30,7 +30,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(id name registered_at postal_code phone movies_checked_out_count) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) get customers_url body = JSON.parse(response.body) body.each do |customer| From fc5610d5335ef5ab9294fed11f99e1f37684c862 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Tue, 8 May 2018 10:59:08 -0700 Subject: [PATCH 20/57] adds index, show, and create methods to Movies controller --- app/controllers/movies_controller.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b69241e5f..1a5228e0e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,10 +1,33 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]) end + def show + movie = Movie.find_by(id: params[:id]) + if movie + render json: movie.as_json(only: [:id, :inventory, :overview, :release_date, :title]), status: :ok + else + render json: { ok: false, errors: "Movie not found" }, status: :not_found + end end def create + movie = Movie.create(movie_params) + if movie.valid? + render json: { id: movie.id }, status: :ok + else + render json: { ok: false, errors: movie.errors }, + status: :bad_request + end end end + +private + +def movie_params + return params.require(:movie).permit(:title, :overview, :release_date, :inventory) +end From d180a2f5d0c06f627222387c213837c0ca827f58 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Tue, 8 May 2018 10:59:55 -0700 Subject: [PATCH 21/57] adds test for movies#show. all movies controller tests passing --- test/controllers/movies_controller_test.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 4aca9e818..86d674478 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -26,7 +26,7 @@ end it "returns movies with exactly the required fields" do - keys = %w(id title release_date) + keys = %w(id release_date title) get movies_url body = JSON.parse(response.body) body.each do |movie| @@ -41,6 +41,14 @@ must_respond_with :success end + it "returns a movie with exactly the required fields" do + keanu = movies(:keanu) + keys = %w(id inventory overview release_date title) + get movie_url(keanu.id) + body = JSON.parse(response.body) + body.keys.sort.must_equal keys + end + it "returns a 404 for movies that are not found" do movie = movies(:babe) movie.destroy From 066353deb7ec86590773a9c3f6725ecfe1936c9a Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Tue, 8 May 2018 11:15:29 -0700 Subject: [PATCH 22/57] correct movies show path --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index c6bb85d57..e7cbc2d60 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ get '/customers', to: 'customers#index', as: 'customers' get '/movies', to: 'movies#index', as: 'movies' - get '/movie/:id', to: 'movies#show', as: 'movie' + get '/movies/:id', to: 'movies#show', as: 'movie' post '/movies', to: 'movies#create', as: 'new_movie' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html From 36fc858c50fc8be88df33a44018758c3bda36a74 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Tue, 8 May 2018 12:04:24 -0700 Subject: [PATCH 23/57] edits movies#create --- app/controllers/movies_controller.rb | 8 ++++---- config/routes.rb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1a5228e0e..d9be91271 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -16,9 +16,9 @@ def show end def create - movie = Movie.create(movie_params) - if movie.valid? - render json: { id: movie.id }, status: :ok + movie = Movie.new(movie_params) + if movie.save + render json:movie.as_json(only: [:title, :overview, :release_date, :inventory, :id]), status: :ok else render json: { ok: false, errors: movie.errors }, status: :bad_request @@ -29,5 +29,5 @@ def create private def movie_params - return params.require(:movie).permit(:title, :overview, :release_date, :inventory) + return params.permit(:inventory, :overview, :release_date, :title) end diff --git a/config/routes.rb b/config/routes.rb index c6bb85d57..82b379371 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,9 @@ Rails.application.routes.draw do get '/customers', to: 'customers#index', as: 'customers' + get '/movies', to: 'movies#index', as: 'movies' get '/movie/:id', to: 'movies#show', as: 'movie' - - post '/movies', to: 'movies#create', as: 'new_movie' + post '/movies', to: 'movies#create' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 7ef918188844f66120632bb49545e6d382a047d4 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Tue, 8 May 2018 12:36:06 -0700 Subject: [PATCH 24/57] minor change to json ouput for movies#create --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d9be91271..60e5a1f97 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,7 @@ def show def create movie = Movie.new(movie_params) if movie.save - render json:movie.as_json(only: [:title, :overview, :release_date, :inventory, :id]), status: :ok + render json:movie.as_json(only: [:id]), status: :ok else render json: { ok: false, errors: movie.errors }, status: :bad_request From 9f0af194efe6c99a28e28f7b5971d930063100c1 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Tue, 8 May 2018 12:59:45 -0700 Subject: [PATCH 25/57] update routes to include rentals --- config/routes.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index e9365a883..3908bb228 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,12 +1,9 @@ Rails.application.routes.draw do - get '/customers', to: 'customers#index', as: 'customers' - - get '/movies', to: 'movies#index', as: 'movies' - - post '/movies', to: 'movies#create' - - get '/movies/:id', to: 'movies#show', as: 'movie' - + resources :movies, only: [:index, :show, :create] + resources :customers, only: [:index] + post 'rentals/checkout', to: 'rentals#checkout', as: 'checkout' + post 'rentals/checkin', to: 'rentals#checkin', as: 'checkin' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + end From 056182cb939cbc4e8c2b9074d975e00f50174977 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Tue, 8 May 2018 13:59:27 -0700 Subject: [PATCH 26/57] minor typo in movies controller --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 60e5a1f97..40267c076 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,7 @@ def show def create movie = Movie.new(movie_params) if movie.save - render json:movie.as_json(only: [:id]), status: :ok + render json: movie.as_json(only: [:id]), status: :ok else render json: { ok: false, errors: movie.errors }, status: :bad_request From de880e3fe35a25e42df07b8dae7a0f0d9277e372 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Tue, 8 May 2018 13:59:54 -0700 Subject: [PATCH 27/57] adds more assertions to movies#create tests --- test/controllers/movies_controller_test.rb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 86d674478..496f63c2a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -76,16 +76,27 @@ it "creates a new movie" do proc { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change 'Movie.count', 1 must_respond_with :success + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "id" + + # Check that the ID matches + Movie.find(body["id"]).title.must_equal movie_data[:title] end it "returns a bad request for a bad params data" do proc { - post movies_path, params: {movie: bad_movie_data} + post movies_path, params: bad_movie_data }.must_change "Movie.count", 0 must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "title" end end From f8f284235c0dc53f5b59b9f97e7fb7aafc8bbf6a Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Tue, 8 May 2018 14:00:20 -0700 Subject: [PATCH 28/57] adds rentals controller tests for checkin method --- test/controllers/rentals_controller_test.rb | 55 ++++++++++++++++++--- 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index da64a7a36..1636f7134 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,14 +1,57 @@ require "test_helper" describe RentalsController do - it "should get checkout" do - get rentals_checkout_url - value(response).must_be :success? + let(:rental_one) { rentals(:rental_one) } + let(:sara) { customers(:sara) } + let(:babe) { movies(:babe) } + + describe "checkout" do + + let(:rental_data) { + { + movie_id: babe, + customer_id: sara, + checkout_date: Date.today + } + } + + let(:bad_rental_data) { + { + movie_id: 4567, + customer_id: 9876, + checkout_date: Date.today + } + } + + it "creates a new Rental" do + proc { + post checkout_path, params: {rental: rental_data} + }.must_change "Rental.count", 1 + must_respond_with :success + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "id" + + # Check that the ID matches + Rental.find(body["id"]).movie_id.must_equal rental_data[:movie_id] + end + + it "returns a bad request for a bad params data" do + proc { + post checkout_path, params: {rental: bad_rental_data} + }.must_change "Rental.count", 0 + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "movie_id" + end end - it "should get checkin" do - get rentals_checkin_url - value(response).must_be :success? + describe "checkin" do + end end From b89e45ac31c5206b753ee0ecfa0d547885f6581a Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Tue, 8 May 2018 14:00:38 -0700 Subject: [PATCH 29/57] updates rental fixture data; --- test/fixtures/rentals.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 96296b376..c1a0af28d 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,12 +4,12 @@ rental_one: customer: nora movie: babe checkout_date: 2018-05-07 - due_date: 2018-05-17 + due_date: 2018-05-12 returned?: false rental_two: customer: sara movie: keanu checkout_date: 2018-05-07 - due_date: 2018-05-17 + due_date: 2018-05-12 returned?: false From 3511b519cfdd672e0900c2b1c5740ca16cb60817 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Tue, 8 May 2018 15:14:11 -0700 Subject: [PATCH 30/57] add checkin tests for the rentals controller --- test/controllers/rentals_controller_test.rb | 31 ++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1636f7134..29c80f9ec 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -33,7 +33,7 @@ body.must_be_kind_of Hash body.must_include "id" - # Check that the ID matches + # Check that the ID matches Rental.find(body["id"]).movie_id.must_equal rental_data[:movie_id] end @@ -51,6 +51,35 @@ end describe "checkin" do + # + # let(:checkin_data) { + # { + # movie_id: rental_one.movie_id, + # customer_id: rental_one.customer_id, + # returned?: true + # } + # let(:bad_checkin_data) { + # { + # customer_id: rentals(:rental_two).customer_id, + # returned?: true + # } + # } + + it "updates a rental when returned" do + proc { + post checkin_path(rental_one.id) + }.must_change "Rental.count", 0 + must_respond_with :success + # updated_rental = Rental.find_by(id: rental_one.id) + rental_one.returned?.must_equal true + end + + it "returns a bad request for a bad checkin" do + proc { + post checkin_path(3437829) + }.must_change "Rental.count", 0 + must_respond_with :bad_request + end end From 2a882cdd50bff1c42ca5e97e21aec7b2b4cc1fe3 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Tue, 8 May 2018 16:51:50 -0700 Subject: [PATCH 31/57] added checkout method in controller, updated model and test as needed --- app/controllers/rentals_controller.rb | 33 +++++++++++++++++++++ app/models/rental.rb | 15 +++++++++- test/controllers/rentals_controller_test.rb | 23 ++++++-------- 3 files changed, 56 insertions(+), 15 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 012699722..eeebc09e5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,40 @@ class RentalsController < ApplicationController + def checkout + # if params[:rental][:movie_id].nil? || params[:rental][:customer_id].nil? + # render json: { ok: false, errors: "Not found" }, status: :not_found + # else + movie = Movie.find_by(id: params[:rental][:movie_id]) + customer = Customer.find_by(id: params[:rental][:customer_id]) + if movie.nil? || customer.nil? + render json: { ok: false }, status: :bad_request + else + if movie.inventory > 0 + rental = Rental.create(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id]) + rental.checkout_date = Date.today + rental.due_date = rental.checkout_date + 7 + rental.update(returned?: false) + if rental + movie.inventory -= 1 # Todo: consider making method in movie class + movie.save + render json: rental.as_json(), status: :ok + else + render json: { ok: false, errors: rental.errors }, + status: :bad_request + end + else + render json: { ok: false, errors: rental.errors }, + status: :bad_request # Todo: look up to see if better status + end + end end def checkin end + + private + + def rental_params + return params.permit(:customer_id, :movie_id) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 78b0f18e1..19f33e5a5 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,5 +2,18 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - validates :checkout_date, presence: true + # validates :checkout_date, presence: true + validates :movie_id, presence: true + validates :customer_id, presence: true + + # after_save :set_return_to_false + # after_save :reduce_inventory + + + # private + # + # def set_return_to_false + # rental.update(returned?: false) + # end + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 29c80f9ec..79440e0e6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -9,8 +9,8 @@ let(:rental_data) { { - movie_id: babe, - customer_id: sara, + movie_id: babe.id, + customer_id: sara.id, checkout_date: Date.today } } @@ -42,11 +42,6 @@ post checkout_path, params: {rental: bad_rental_data} }.must_change "Rental.count", 0 must_respond_with :bad_request - - body = JSON.parse(response.body) - body.must_be_kind_of Hash - body.must_include "errors" - body["errors"].must_include "movie_id" end end @@ -73,13 +68,13 @@ # updated_rental = Rental.find_by(id: rental_one.id) rental_one.returned?.must_equal true end - - it "returns a bad request for a bad checkin" do - proc { - post checkin_path(3437829) - }.must_change "Rental.count", 0 - must_respond_with :bad_request - end + # + # it "returns a bad request for a bad checkin" do + # proc { + # post checkin_path(3437829) + # }.must_change "Rental.count", 0 + # must_respond_with :bad_request + # end end From 180aaf86d0c12eb4bf950d2b8d78dbde184bf51c Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Tue, 8 May 2018 17:42:22 -0700 Subject: [PATCH 32/57] writes rental#checkin --- app/controllers/rentals_controller.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index eeebc09e5..002a38456 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -30,6 +30,15 @@ def checkout end def checkin + rental = Rental.find_by(params[:id]) + if rental.nil? + render json: { ok: false }, status: :no_content + else + rental.update(returned?: true) + movie = Movie.find_by(id: rental.movie_id) + movie.inventory += 1 # Todo: consider making method in movie class + movie.save + end end private From e53a93fe1debb9724673c4a1e5989752002aea5a Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Tue, 8 May 2018 17:44:19 -0700 Subject: [PATCH 33/57] adds assertions, refactoring to rentals controller tests --- test/controllers/rentals_controller_test.rb | 40 +++++++++------------ 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 79440e0e6..2a04f8fb6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,7 +14,6 @@ checkout_date: Date.today } } - let(:bad_rental_data) { { movie_id: 4567, @@ -22,8 +21,8 @@ checkout_date: Date.today } } - it "creates a new Rental" do + id = babe.id proc { post checkout_path, params: {rental: rental_data} }.must_change "Rental.count", 1 @@ -35,6 +34,8 @@ # Check that the ID matches Rental.find(body["id"]).movie_id.must_equal rental_data[:movie_id] + babe = Movie.find_by(id: id) + babe.inventory.must_equal 2 end it "returns a bad request for a bad params data" do @@ -46,35 +47,28 @@ end describe "checkin" do - # - # let(:checkin_data) { - # { - # movie_id: rental_one.movie_id, - # customer_id: rental_one.customer_id, - # returned?: true - # } - # let(:bad_checkin_data) { - # { - # customer_id: rentals(:rental_two).customer_id, - # returned?: true - # } - # } it "updates a rental when returned" do + id = rental_one.id + movie_id = babe.id proc { post checkin_path(rental_one.id) }.must_change "Rental.count", 0 must_respond_with :success - # updated_rental = Rental.find_by(id: rental_one.id) + + rental_one = Rental.find_by(id: id) rental_one.returned?.must_equal true + babe = Movie.find_by(id: movie_id) + babe.inventory.must_equal 4 + end + + it "returns a bad request for a non-existent rental" do + + proc { + post checkin_path(234567890) + }.must_change "Rental.count", 0 + must_respond_with :no_content end - # - # it "returns a bad request for a bad checkin" do - # proc { - # post checkin_path(3437829) - # }.must_change "Rental.count", 0 - # must_respond_with :bad_request - # end end From 7beb266133f493bea3e614fcc743a6c131d570ac Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Wed, 9 May 2018 10:35:19 -0700 Subject: [PATCH 34/57] add due dates method --- app/controllers/rentals_controller.rb | 5 +---- app/models/rental.rb | 10 ++++++++-- .../20180509172628_remove_due_date_from_rental.rb | 5 +++++ db/schema.rb | 3 +-- test/fixtures/rentals.yml | 2 -- test/models/rental_test.rb | 11 ++++++----- 6 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 db/migrate/20180509172628_remove_due_date_from_rental.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 002a38456..20b5fe457 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -10,10 +10,7 @@ def checkout render json: { ok: false }, status: :bad_request else if movie.inventory > 0 - rental = Rental.create(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id]) - rental.checkout_date = Date.today - rental.due_date = rental.checkout_date + 7 - rental.update(returned?: false) + rental = Rental.create(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], checkout_date: Date.today, returned?: false) if rental movie.inventory -= 1 # Todo: consider making method in movie class movie.save diff --git a/app/models/rental.rb b/app/models/rental.rb index 19f33e5a5..73f21f35b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,15 +2,21 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - # validates :checkout_date, presence: true validates :movie_id, presence: true validates :customer_id, presence: true # after_save :set_return_to_false # after_save :reduce_inventory + def get_due_date + return calc_due_date + end - # private + private + + def calc_due_date + return checkout_date + 7 + end # # def set_return_to_false # rental.update(returned?: false) diff --git a/db/migrate/20180509172628_remove_due_date_from_rental.rb b/db/migrate/20180509172628_remove_due_date_from_rental.rb new file mode 100644 index 000000000..b10d8e68b --- /dev/null +++ b/db/migrate/20180509172628_remove_due_date_from_rental.rb @@ -0,0 +1,5 @@ +class RemoveDueDateFromRental < ActiveRecord::Migration[5.1] + def change + remove_column :rentals, :due_date + end +end diff --git a/db/schema.rb b/db/schema.rb index f83b00327..750fc2982 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: 20180507224722) do +ActiveRecord::Schema.define(version: 20180509172628) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,7 +38,6 @@ create_table "rentals", force: :cascade do |t| t.date "checkout_date" - t.date "due_date" t.boolean "returned?" t.datetime "created_at", null: false t.datetime "updated_at", null: false diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index c1a0af28d..7e6b7b69b 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,12 +4,10 @@ rental_one: customer: nora movie: babe checkout_date: 2018-05-07 - due_date: 2018-05-12 returned?: false rental_two: customer: sara movie: keanu checkout_date: 2018-05-07 - due_date: 2018-05-12 returned?: false diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 0877ff92d..87d865365 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -11,11 +11,6 @@ rental_one.valid?.must_equal true end - it "requires a checkout_date" do - rental_two.checkout_date = nil - rental_two.valid?.must_equal false - end - end describe "relations" do @@ -37,4 +32,10 @@ rental_two.movie.title.must_equal "Keanu" end end + + describe "get due date" do + it "must get the due date" do + rental_one.get_due_date.must_equal Date.parse('2018-05-14') + end + end end From 5b802ff138e3dc58a7023346e724769197bd56dc Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 11:15:08 -0700 Subject: [PATCH 35/57] updates inventory method call in rentals controller tests --- app/controllers/rentals_controller.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 20b5fe457..2d97736dd 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -9,19 +9,16 @@ def checkout if movie.nil? || customer.nil? render json: { ok: false }, status: :bad_request else - if movie.inventory > 0 + if movie.get_available_inventory > 0 rental = Rental.create(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], checkout_date: Date.today, returned?: false) if rental - movie.inventory -= 1 # Todo: consider making method in movie class - movie.save render json: rental.as_json(), status: :ok else render json: { ok: false, errors: rental.errors }, status: :bad_request end else - render json: { ok: false, errors: rental.errors }, - status: :bad_request # Todo: look up to see if better status + render json: { ok: false}, status: :bad_request # Todo: look up to see if better status end end end From 7464ba4d09463349a96a9e8784fd8da17fa1c6d9 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 11:15:43 -0700 Subject: [PATCH 36/57] creates movie#get_available_inventory --- app/models/movie.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 4b99e43ed..e2f644cdb 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,8 +4,16 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, presence: true, numericality: true - def available_inventory + def get_available_inventory + calc_inventory + end + + private + def calc_inventory + checked_out = self.rentals.where(returned?: false).count + return self.inventory - checked_out end + end From d83c3d45cf69e188fb5d56d950c5450b366bc0d7 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 11:16:08 -0700 Subject: [PATCH 37/57] updates rentals controller tests --- test/controllers/rentals_controller_test.rb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 2a04f8fb6..38e0fd2fd 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -35,7 +35,20 @@ # Check that the ID matches Rental.find(body["id"]).movie_id.must_equal rental_data[:movie_id] babe = Movie.find_by(id: id) - babe.inventory.must_equal 2 + babe.get_available_inventory.must_equal 1 + end + + it "does not create new Rental if inventory 0" do + id = babe.id + babe.inventory = 0 + babe.save + proc { + post checkout_path, params: {rental: rental_data} + }.must_change "Rental.count", 0 + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash end it "returns a bad request for a bad params data" do @@ -59,11 +72,10 @@ rental_one = Rental.find_by(id: id) rental_one.returned?.must_equal true babe = Movie.find_by(id: movie_id) - babe.inventory.must_equal 4 + babe.get_available_inventory.must_equal 4 end it "returns a bad request for a non-existent rental" do - proc { post checkin_path(234567890) }.must_change "Rental.count", 0 From 163b28bcc0838947e28d2f4e341e905b9d2d1a96 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 11:16:29 -0700 Subject: [PATCH 38/57] edits movie test assertion; --- test/models/movie_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 0a63f9887..906d6830e 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -44,7 +44,7 @@ describe "inventory" do it "returns the available inventory" do - babe.available_inventory.must_equal 2 + babe.get_available_inventory.must_equal 2 end end From 2fd0b854209d6974b1230f95b5bc9d6b046dbba4 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 14:20:12 -0700 Subject: [PATCH 39/57] experimenting with strong params and setting defaults in rentals#checkout --- app/controllers/customers_controller.rb | 3 ++- app/controllers/rentals_controller.rb | 19 +++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 013c9daa9..970e1fef0 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,7 @@ 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]) + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) end + end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2d97736dd..4de0e0411 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,18 +1,15 @@ class RentalsController < ApplicationController def checkout - # if params[:rental][:movie_id].nil? || params[:rental][:customer_id].nil? - # render json: { ok: false, errors: "Not found" }, status: :not_found - # else - movie = Movie.find_by(id: params[:rental][:movie_id]) - customer = Customer.find_by(id: params[:rental][:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + customer = Customer.find_by(id: params[:customer_id]) if movie.nil? || customer.nil? render json: { ok: false }, status: :bad_request else - if movie.get_available_inventory > 0 - rental = Rental.create(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], checkout_date: Date.today, returned?: false) + if movie.available_inventory > 0 + rental = Rental.create(rental_params) if rental - render json: rental.as_json(), status: :ok + render status: :ok else render json: { ok: false, errors: rental.errors }, status: :bad_request @@ -29,15 +26,13 @@ def checkin render json: { ok: false }, status: :no_content else rental.update(returned?: true) - movie = Movie.find_by(id: rental.movie_id) - movie.inventory += 1 # Todo: consider making method in movie class - movie.save + rental.save end end private def rental_params - return params.permit(:customer_id, :movie_id) + return params.permit(:customer_id, :movie_id).merge(checkout_date: Date.today, returned?: false) end end From a82f99c687c29b90686965d3875f796016e7e48d Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 14:20:47 -0700 Subject: [PATCH 40/57] adds as_json to pass in optional response attributes for customer --- app/models/customer.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index ee1f6d755..7b24dec3a 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,4 +2,21 @@ class Customer < ApplicationRecord has_many :rentals, dependent: :destroy validates_presence_of :name, :registered_at + + def as_json(options={}) + options[:methods] = [:movies_checked_out_count] + super + end + + def movies_checked_out_count + movies_checked_out + end + + private + + def movies_checked_out + self.rentals.where(returned?: false).count + end + + end From 253b9d3a792e57f1b53dcbe69ac04e1a921d01e5 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 14:21:29 -0700 Subject: [PATCH 41/57] adds json options to movie model; --- app/models/movie.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index e2f644cdb..d19d1cbfe 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,7 +4,12 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, presence: true, numericality: true - def get_available_inventory + def as_json(options={}) + options[:methods] = [:available_inventory] + super + end + + def available_inventory calc_inventory end From bf14a690b4033186549917c7d1a0f674e35b0b35 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 14:21:54 -0700 Subject: [PATCH 42/57] adds avail inventory to movies controller test output --- test/controllers/movies_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 496f63c2a..0e89b2034 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -26,7 +26,7 @@ end it "returns movies with exactly the required fields" do - keys = %w(id release_date title) + keys = %w(available_inventory id release_date title) get movies_url body = JSON.parse(response.body) body.each do |movie| @@ -43,7 +43,7 @@ it "returns a movie with exactly the required fields" do keanu = movies(:keanu) - keys = %w(id inventory overview release_date title) + keys = %w(available_inventory id inventory overview release_date title) get movie_url(keanu.id) body = JSON.parse(response.body) body.keys.sort.must_equal keys From fa30da5e93c555183d40f0e42f6dec18314250b5 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 14:22:19 -0700 Subject: [PATCH 43/57] experimenting with rental params. test throwing error --- test/controllers/rentals_controller_test.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 38e0fd2fd..0f9465ffb 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -11,23 +11,20 @@ { movie_id: babe.id, customer_id: sara.id, - checkout_date: Date.today } } let(:bad_rental_data) { { movie_id: 4567, customer_id: 9876, - checkout_date: Date.today } } it "creates a new Rental" do id = babe.id proc { - post checkout_path, params: {rental: rental_data} + post checkout_path, params: rental_data }.must_change "Rental.count", 1 must_respond_with :success - body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "id" @@ -35,7 +32,7 @@ # Check that the ID matches Rental.find(body["id"]).movie_id.must_equal rental_data[:movie_id] babe = Movie.find_by(id: id) - babe.get_available_inventory.must_equal 1 + babe.available_inventory.must_equal 1 end it "does not create new Rental if inventory 0" do @@ -72,7 +69,7 @@ rental_one = Rental.find_by(id: id) rental_one.returned?.must_equal true babe = Movie.find_by(id: movie_id) - babe.get_available_inventory.must_equal 4 + babe.available_inventory.must_equal 3 end it "returns a bad request for a non-existent rental" do From 5bf9a9f87f9d74d2cf4cef23443e7955dedf230b Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 14:22:38 -0700 Subject: [PATCH 44/57] fixes assertion in movie test --- test/models/movie_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 906d6830e..0a63f9887 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -44,7 +44,7 @@ describe "inventory" do it "returns the available inventory" do - babe.get_available_inventory.must_equal 2 + babe.available_inventory.must_equal 2 end end From 220ef9cf6ad8183d133c7e4fba048910a71141cf Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 15:08:43 -0700 Subject: [PATCH 45/57] adjusts rentals#checkout --- app/controllers/rentals_controller.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4de0e0411..4e648d886 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,15 +1,15 @@ class RentalsController < ApplicationController def checkout - movie = Movie.find_by(id: params[:movie_id]) - customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:rental][:movie_id]) + customer = Customer.find_by(id: params[:rental][:customer_id]) if movie.nil? || customer.nil? render json: { ok: false }, status: :bad_request else if movie.available_inventory > 0 - rental = Rental.create(rental_params) + rental = Rental.create(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], returned?: false) if rental - render status: :ok + render json: rental.as_json(), status: :ok else render json: { ok: false, errors: rental.errors }, status: :bad_request @@ -26,13 +26,12 @@ def checkin render json: { ok: false }, status: :no_content else rental.update(returned?: true) - rental.save end end private def rental_params - return params.permit(:customer_id, :movie_id).merge(checkout_date: Date.today, returned?: false) + return params.permit(:customer_id, :movie_id) end end From 5dd1b6d66359042872537494e7dd09fb416eb965 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 15:08:55 -0700 Subject: [PATCH 46/57] idk --- app/models/rental.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 73f21f35b..91e016cfd 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -8,6 +8,7 @@ class Rental < ApplicationRecord # after_save :set_return_to_false # after_save :reduce_inventory + def get_due_date return calc_due_date end From 10b82d2231637119b7eee7c98d68cfc2f818828f Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 15:09:13 -0700 Subject: [PATCH 47/57] fixes test --- test/controllers/rentals_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0f9465ffb..44d1339a5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -22,13 +22,13 @@ it "creates a new Rental" do id = babe.id proc { - post checkout_path, params: rental_data + post checkout_path, params: {rental: rental_data} }.must_change "Rental.count", 1 must_respond_with :success + body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "id" - # Check that the ID matches Rental.find(body["id"]).movie_id.must_equal rental_data[:movie_id] babe = Movie.find_by(id: id) From 08397761f57cadfa47fd9498516e0401af4ee75c Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Wed, 9 May 2018 17:57:15 -0700 Subject: [PATCH 48/57] update checkin method to take in the movie_id and customer_id --- app/controllers/rentals_controller.rb | 4 +++- app/models/rental.rb | 2 ++ config/routes.rb | 4 ++-- test/controllers/rentals_controller_test.rb | 19 +++++++++++++++++-- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4e648d886..87464e83c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -21,7 +21,9 @@ def checkout end def checkin - rental = Rental.find_by(params[:id]) + rental = Rental.where(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], returned?: false ) + # rental = Rental.find_by(params[:id]) + if rental.nil? render json: { ok: false }, status: :no_content else diff --git a/app/models/rental.rb b/app/models/rental.rb index 91e016cfd..c7d21ea9e 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,6 +4,8 @@ class Rental < ApplicationRecord validates :movie_id, presence: true validates :customer_id, presence: true + # attribute :checkout, Date, default: Date.today + # attribute :returned? Boolean, default: false # after_save :set_return_to_false # after_save :reduce_inventory diff --git a/config/routes.rb b/config/routes.rb index 3908bb228..79c74c542 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,8 +2,8 @@ resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] - post 'rentals/checkout', to: 'rentals#checkout', as: 'checkout' - post 'rentals/checkin', to: 'rentals#checkin', as: 'checkin' + post 'rentals/check-out', to: 'rentals#checkout', as: 'checkout' + post 'rentals/check-in', to: 'rentals#checkin', as: 'checkin' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 44d1339a5..146dc8eed 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,6 +4,7 @@ let(:rental_one) { rentals(:rental_one) } let(:sara) { customers(:sara) } let(:babe) { movies(:babe) } + let(:nora) { customers(:nora) } describe "checkout" do @@ -57,12 +58,26 @@ end describe "checkin" do + let(:checkin_data) { + { + movie_id: babe.id, + customer_id: nora.id, + } + } + + let(:bad_checkin_data) { + { + movie_id: 12121, + customer_id: 493771, + } + } it "updates a rental when returned" do id = rental_one.id movie_id = babe.id + # customer_id = nora.id proc { - post checkin_path(rental_one.id) + post checkin_path, params: {rental: checkin_data} }.must_change "Rental.count", 0 must_respond_with :success @@ -74,7 +89,7 @@ it "returns a bad request for a non-existent rental" do proc { - post checkin_path(234567890) + post checkin_path, params: {rental: bad_checkin_data} }.must_change "Rental.count", 0 must_respond_with :no_content end From b94308ee786b855964c804a463d7b4e077c0fe62 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Wed, 9 May 2018 18:32:11 -0700 Subject: [PATCH 49/57] tweaks rentals#checkin to return status ok upon successful request --- app/controllers/rentals_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 87464e83c..2ad31e3d7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -23,11 +23,11 @@ def checkout def checkin rental = Rental.where(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], returned?: false ) # rental = Rental.find_by(params[:id]) - - if rental.nil? + if rental.empty? render json: { ok: false }, status: :no_content else rental.update(returned?: true) + render json: rental.as_json(), status: :ok end end From 428763b2b5098549d0b3f6e62784a208535b9cb4 Mon Sep 17 00:00:00 2001 From: Cheeron Mars Date: Thu, 10 May 2018 15:47:40 -0700 Subject: [PATCH 50/57] add query parameters --- Gemfile | 6 ++++++ app/controllers/customers_controller.rb | 11 +++++++++-- config/initializers/will_paginate.rb | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 config/initializers/will_paginate.rb diff --git a/Gemfile b/Gemfile index 78bff8d26..67202bca9 100644 --- a/Gemfile +++ b/Gemfile @@ -24,6 +24,10 @@ gem 'puma', '~> 3.7' # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible # gem 'rack-cors' +gem 'jbuilder' +gem 'rabl' +gem 'will_paginate' + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console @@ -35,6 +39,8 @@ group :development do # 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' + gem 'better_errors' + gem 'binding_of_caller' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 970e1fef0..d942a4cf6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,14 @@ class CustomersController < ApplicationController def index - customers = Customer.all + if params[:sort] == "name" + customers = Customer.all.order(:name).paginate(page: params[:p], per_page: params[:n]) + elsif params[:sort] == "registered_at" + customers = Customer.all.order(:registered_at).paginate(page: params[:p], per_page: params[:n]) + elsif params[:sort] == "postal_code" + customers = Customer.all.order(:postal_code).paginate(page: params[:p], per_page: params[:n]) + else + customers = Customer.all + end render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) end - end diff --git a/config/initializers/will_paginate.rb b/config/initializers/will_paginate.rb new file mode 100644 index 000000000..dfed3fe9e --- /dev/null +++ b/config/initializers/will_paginate.rb @@ -0,0 +1 @@ +require 'will_paginate/array' From c35368c7e196babfed105fa0d02d64a5dec2373b Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Fri, 11 May 2018 15:14:28 -0700 Subject: [PATCH 51/57] adds to gemfile.lock --- Gemfile.lock | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index e547d2449..a951a7431 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,17 +40,27 @@ GEM tzinfo (~> 1.1) ansi (1.5.0) arel (8.0.0) + better_errors (2.4.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) builder (3.2.3) byebug (10.0.2) coderay (1.1.2) concurrent-ruby (1.0.5) crass (1.0.4) + debug_inspector (0.0.3) erubi (1.7.1) ffi (1.9.23) globalid (0.4.1) activesupport (>= 4.2.0) i18n (1.0.1) concurrent-ruby (~> 1.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -72,6 +82,7 @@ GEM builder minitest (>= 5.0) ruby-progressbar + multi_json (1.13.1) nio4r (2.3.1) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) @@ -82,6 +93,8 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) puma (3.11.4) + rabl (0.13.1) + activesupport (>= 2.3.14) rack (2.0.5) rack-test (1.0.0) rack (>= 1.0, < 3) @@ -133,22 +146,28 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) + will_paginate (3.1.6) PLATFORMS ruby DEPENDENCIES + better_errors + binding_of_caller byebug + jbuilder listen (>= 3.0.5, < 3.2) minitest-rails minitest-reporters pg (>= 0.18, < 2.0) pry-rails puma (~> 3.7) + rabl rails (~> 5.1.6) spring spring-watcher-listen (~> 2.0.0) tzinfo-data + will_paginate BUNDLED WITH 1.16.1 From 2407230aa0f59e4674525144617dc54706dcbdcb Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Fri, 11 May 2018 15:14:53 -0700 Subject: [PATCH 52/57] adds sorting params to movies#index --- app/controllers/movies_controller.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 40267c076..2c9a872a2 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,13 @@ class MoviesController < ApplicationController def index - movies = Movie.all + if params[:sort] == "title" + movies = Movie.all.order(:title).paginate(page: params[:p], per_page: params[:n]) + elsif params[:sort] == "release_date" + movies = Movie.all.order(:release_date).paginate(page: params[:p], per_page: params[:n]) + else + movies = Movie.all + end render json: movies.as_json(only: [:id, :title, :release_date]) end From 926d116b17e05f86ea0a8d84296fadc368403980 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Fri, 11 May 2018 15:15:12 -0700 Subject: [PATCH 53/57] adds rentals#overdue --- app/controllers/rentals_controller.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2ad31e3d7..ce667bd35 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,7 +7,7 @@ def checkout render json: { ok: false }, status: :bad_request else if movie.available_inventory > 0 - rental = Rental.create(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], returned?: false) + rental = Rental.create(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], returned?: false, checkout_date: Date.today) if rental render json: rental.as_json(), status: :ok else @@ -31,6 +31,22 @@ def checkin end end + def overdue + rentals = Rental.get_overdue + # if params[:sort] == "title" + # rentals.order(:movie_id.title).paginate(page: params[:p], per_page: params[:n]) + # elsif params[:sort] == "name" + # rentals.order(:name).paginate(page: params[:p], per_page: params[:n]) + # elsif params[:sort] == "checkout_date" + # rentals.order(:checkout_date).paginate(page: params[:p], per_page: params[:n]) + # elsif params[:sort] == "due_date" + # rentals.order(:checkout_date).paginate(page: params[:p], per_page: params[:n]) + # else + # rentals + # end + render json: rentals.as_json(), status: :ok + end + private def rental_params From 5d4c36ba24303b7d678a381fb28d7f012930bf8e Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Fri, 11 May 2018 15:15:31 -0700 Subject: [PATCH 54/57] sets default pagination in app controller --- app/models/application_record.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 10a4cba84..02a61c36f 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,3 +1,4 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true + self.per_page = 200 end From 381f85656490faf9006f1926f1c7e5a34df0ecd1 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Fri, 11 May 2018 15:15:57 -0700 Subject: [PATCH 55/57] no changes --- app/models/movie.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index d19d1cbfe..5c4d240c3 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -20,5 +20,4 @@ def calc_inventory return self.inventory - checked_out end - end From f3dcec4ba95c09bc1839eb805d5fc8050980b0a6 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Fri, 11 May 2018 15:16:31 -0700 Subject: [PATCH 56/57] adds rental model methods for getting checkedout and overdue rentals --- app/models/rental.rb | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index c7d21ea9e..4c60696cc 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,25 +4,28 @@ class Rental < ApplicationRecord validates :movie_id, presence: true validates :customer_id, presence: true - # attribute :checkout, Date, default: Date.today - # attribute :returned? Boolean, default: false - - # after_save :set_return_to_false - # after_save :reduce_inventory - def get_due_date return calc_due_date end + def self.get_checked_out + # return Rental.all.where(returned? == false) + return self.select { |rental| rental.returned? == false } + end + + def self.get_overdue + checked_out_rentals = Rental.get_checked_out + # overdue_rentals = checked_out_rentals.where(Date.today > get_due_date) + overdue_rentals = checked_out_rentals.select { |rental| Date.today > rental.get_due_date } + return overdue_rentals + end + + private def calc_due_date return checkout_date + 7 end - # - # def set_return_to_false - # rental.update(returned?: false) - # end end From cfa7f702860d67ea25fad0da8fac60d816bbd043 Mon Sep 17 00:00:00 2001 From: Nora Peters Date: Fri, 11 May 2018 15:16:55 -0700 Subject: [PATCH 57/57] adds route for overdue rentals --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 79c74c542..85ed7c535 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,8 @@ resources :customers, only: [:index] post 'rentals/check-out', to: 'rentals#checkout', as: 'checkout' post 'rentals/check-in', to: 'rentals#checkin', as: 'checkin' + + get 'rentals/overdue', to: 'rentals#overdue', as: 'overdue' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end