From c3e5c2fe314f58429737f1f7b5407996af2ad5ac Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Mon, 7 May 2018 12:13:46 -0700 Subject: [PATCH 01/27] added rails for api --- .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 + db/seeds.rb | 14 +- 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 55 files changed, 927 insertions(+), 306 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..3481766c0 --- /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: abae9dfb7685eb49c8d52e39a9704950f57ef83a0c42c9f6b11de9dcf2c1c3db17ee204b1520e980b0fea0f7c140693da7f960b2cc48025a85853418275e9cff + +test: + secret_key_base: c31375f2ab8e8c67772adea8b04296822b84bdc3141533c58379f8e85606f4cfeb588b5e0c31b8f7a00f62c8a80113b1e9f2686486d47ef19301a20ef2c7abad + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..1beea2acc 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,7 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - Customer.create!(customer) -end - -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) -end +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) 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 351697ad74a3c624e80b542af5693ca0a9f7cc96 Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Mon, 7 May 2018 14:03:23 -0700 Subject: [PATCH 02/27] created models movie, rental and customers --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ db/migrate/20180507210219_create_movies.rb | 8 ++++++++ db/migrate/20180507210246_create_customers.rb | 8 ++++++++ db/migrate/20180507210258_create_rentals.rb | 8 ++++++++ test/fixtures/customers.yml | 11 +++++++++++ test/fixtures/movies.yml | 11 +++++++++++ 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, 90 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/20180507210219_create_movies.rb create mode 100644 db/migrate/20180507210246_create_customers.rb create mode 100644 db/migrate/20180507210258_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/20180507210219_create_movies.rb b/db/migrate/20180507210219_create_movies.rb new file mode 100644 index 000000000..d7d148ad8 --- /dev/null +++ b/db/migrate/20180507210219_create_movies.rb @@ -0,0 +1,8 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20180507210246_create_customers.rb b/db/migrate/20180507210246_create_customers.rb new file mode 100644 index 000000000..bf1c3bbc9 --- /dev/null +++ b/db/migrate/20180507210246_create_customers.rb @@ -0,0 +1,8 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20180507210258_create_rentals.rb b/db/migrate/20180507210258_create_rentals.rb new file mode 100644 index 000000000..fcd36af2d --- /dev/null +++ b/db/migrate/20180507210258_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value 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 1bc1f9a1334b4fe16e984103e24fdfd206563616 Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Mon, 7 May 2018 14:20:30 -0700 Subject: [PATCH 03/27] Added columns and we set up foreign key relationships --- .../20180507210418_add_atributes_to_movies.rb | 19 +++++++ ...80507211512_add_foreign_keys_to_rentals.rb | 9 ++++ db/schema.rb | 52 +++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 db/migrate/20180507210418_add_atributes_to_movies.rb create mode 100644 db/migrate/20180507211512_add_foreign_keys_to_rentals.rb create mode 100644 db/schema.rb diff --git a/db/migrate/20180507210418_add_atributes_to_movies.rb b/db/migrate/20180507210418_add_atributes_to_movies.rb new file mode 100644 index 000000000..57386b416 --- /dev/null +++ b/db/migrate/20180507210418_add_atributes_to_movies.rb @@ -0,0 +1,19 @@ +class AddAtributesToMovies < ActiveRecord::Migration[5.1] + def change + add_column :movies, :title, :string + add_column :movies, :overview, :string + add_column :movies, :release_date, :date + add_column :movies, :inventory, :integer + + add_column :customers, :name, :string + add_column :customers, :registered_at, :datetime + add_column :customers, :address, :string + add_column :customers, :city, :string + add_column :customers, :state, :string + add_column :customers, :postal_code, :string + add_column :customers, :phone, :string + + add_column :rentals, :end_date, :date + add_column :rentals, :start_date, :date + end +end diff --git a/db/migrate/20180507211512_add_foreign_keys_to_rentals.rb b/db/migrate/20180507211512_add_foreign_keys_to_rentals.rb new file mode 100644 index 000000000..ab9033c25 --- /dev/null +++ b/db/migrate/20180507211512_add_foreign_keys_to_rentals.rb @@ -0,0 +1,9 @@ +class AddForeignKeysToRentals < ActiveRecord::Migration[5.1] + def change + + add_reference :rentals, :movies, foreign_key: true + add_reference :rentals, :customers, foreign_key: true + + + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..578bd437d --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,52 @@ +# 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: 20180507211512) 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + end + + create_table "movies", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + end + + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.date "end_date" + t.date "start_date" + t.bigint "movies_id" + t.bigint "customers_id" + t.index ["customers_id"], name: "index_rentals_on_customers_id" + t.index ["movies_id"], name: "index_rentals_on_movies_id" + end + + add_foreign_key "rentals", "customers", column: "customers_id" + add_foreign_key "rentals", "movies", column: "movies_id" +end From 33d1b43ce842aa5473752f0650061674e11f09d3 Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Mon, 7 May 2018 14:23:33 -0700 Subject: [PATCH 04/27] added something to the seed.rb file --- db/seeds.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2acc..7cb5c8ea7 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,10 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) +JSON.parse(File.read('db/seeds/customers.json')).each do |customer| + Customer.create!(customer) +end + +JSON.parse(File.read('db/seeds/movies.json')).each do |movie| + Movie.create!(movie) +end From e3554a21afbc7c80abbdac188cd2de41dafda4ba Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Mon, 7 May 2018 15:06:35 -0700 Subject: [PATCH 05/27] Test customer validations --- app/models/customer.rb | 1 + test/models/customer_test.rb | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..a62356cd9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + validates :name, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..6bc349c36 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,20 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + describe "validations" do + it "must have a name" do + customer = Customer.new(address: "123 Main St.", city: "Seattle", state: "Washington", postal_code: "12345", phone: "777-777-7777", registered_at: DateTime.now) + customer.must_be_instance_of Customer + customer.wont_be :valid? + end + + it "is valid with a name" do + customer = Customer.new(name: "Sebastián Piñera") + customer.must_be_instance_of Customer + customer.must_be :valid? + end + end + end From 6e8df24ca4a5d3582d3b05c8fc3a7e7a71846b24 Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Mon, 7 May 2018 22:19:24 -0700 Subject: [PATCH 06/27] Added some more validations for the models --- app/models/movie.rb | 2 ++ test/fixtures/movies.yml | 8 ++++++-- test/models/movie_test.rb | 34 +++++++++++++++++++++++++++++++--- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..3805084d2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,4 @@ class Movie < ApplicationRecord + validates :title, presence: true, uniqueness: true + validates :inventory, presence: true end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index dc3ee79b5..279164bb3 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,12 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} +one: + title: Laberinto del Fauno + inventory: 3 + overview: Great movie + release_date: Date.today # column: value # -two: {} + # column: value diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..66a4644f9 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,37 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + describe "validations" do + it "Must have a title" do + movie = Movie.new(overview: "Great movie", release_date: Date.today, inventory: 4) + + movie.must_be_kind_of Movie + movie.wont_be :valid? + end + + it "is valid with a title and inventory" do + movie = Movie.new(title: "El laberinto del Fauno", inventory: 5) + + movie.must_be_kind_of Movie + movie.must_be :valid? + + end + + it "Must have an inventory" do + movie = Movie.new(overview: "Great movie", release_date: Date.today, title: "El laberinto del Fauno") + + movie.must_be_kind_of Movie + movie.wont_be :valid? + + end + + it "must have a unique name" do + movie = Movie.first + + other_movie = Movie.new(title: movie.title, inventory: 4) + + other_movie.wont_be :valid? + end - it "must be valid" do - value(movie).must_be :valid? end end From 28eb4b6ddf879b2690e3170e513f0e0750ca1383 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 8 May 2018 10:20:00 -0700 Subject: [PATCH 07/27] Edit Rental foreign key names, validate Rental date range with custom method --- app/models/rental.rb | 11 +++++++++++ ...508165906_change_typo_in_previous_migration.rb | 9 +++++++++ ...0180508170243_fix_reference_typo_in_rentals.rb | 7 +++++++ db/schema.rb | 14 +++++++------- test/fixtures/customers.yml | 3 ++- test/models/rental_test.rb | 15 +++++++++++---- 6 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 db/migrate/20180508165906_change_typo_in_previous_migration.rb create mode 100644 db/migrate/20180508170243_fix_reference_typo_in_rentals.rb diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..72280bc16 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,13 @@ class Rental < ApplicationRecord + validates :start_date, presence: true + validates :end_date, presence: true + validate :valid_date_range + + def valid_date_range + if start_date < end_date + return true + end + errors.add(:start_date, "Can't be after end date.") + end + end diff --git a/db/migrate/20180508165906_change_typo_in_previous_migration.rb b/db/migrate/20180508165906_change_typo_in_previous_migration.rb new file mode 100644 index 000000000..e056745c1 --- /dev/null +++ b/db/migrate/20180508165906_change_typo_in_previous_migration.rb @@ -0,0 +1,9 @@ +class ChangeTypoInPreviousMigration < ActiveRecord::Migration[5.1] + def change + remove_column :rentals, :movies_id + remove_column :rentals, :customers_id + + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/migrate/20180508170243_fix_reference_typo_in_rentals.rb b/db/migrate/20180508170243_fix_reference_typo_in_rentals.rb new file mode 100644 index 000000000..a177e2c3f --- /dev/null +++ b/db/migrate/20180508170243_fix_reference_typo_in_rentals.rb @@ -0,0 +1,7 @@ +class FixReferenceTypoInRentals < ActiveRecord::Migration[5.1] + def change + remove_column :rentals, :customers_id + + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 578bd437d..0b7ba952b 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: 20180507211512) do +ActiveRecord::Schema.define(version: 20180508170243) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,12 +41,12 @@ t.datetime "updated_at", null: false t.date "end_date" t.date "start_date" - t.bigint "movies_id" - t.bigint "customers_id" - t.index ["customers_id"], name: "index_rentals_on_customers_id" - t.index ["movies_id"], name: "index_rentals_on_movies_id" + t.bigint "movie_id" + t.bigint "customer_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", column: "customers_id" - add_foreign_key "rentals", "movies", column: "movies_id" + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dc3ee79b5..5a12da3e6 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,7 +4,8 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} +one: + name: Bob Esponja # column: value # two: {} diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..c2ae7cb50 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,16 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + describe 'validations' do + before do + @movie = Movie.first + @customer = Customer.first + end - it "must be valid" do - value(rental).must_be :valid? - end + it 'must have a valid date range' do + rental = Rental.new(movie_id: @movie.id, customer_id: @customer.id, start_date: Date.today, end_date: Date.today - 1) + rental.must_be_instance_of Rental + rental.wont_be :valid? + end + end # validations end From f4128f4ca78238887824a04b9b4368b885f826fb Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Tue, 8 May 2018 10:37:43 -0700 Subject: [PATCH 08/27] created validations and tests for relationships --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + app/models/rental.rb | 7 +++++++ test/models/customer_test.rb | 8 ++++++++ test/models/movie_test.rb | 8 ++++++++ test/models/rental_test.rb | 35 ++++++++++++++++++++++++++++------- 6 files changed, 53 insertions(+), 7 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index a62356cd9..8ce4b2c3d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,4 @@ class Customer < ApplicationRecord validates :name, presence: true + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 3805084d2..9cad292ae 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,5 @@ class Movie < ApplicationRecord validates :title, presence: true, uniqueness: true validates :inventory, presence: true + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 72280bc16..64f4a83db 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,6 +3,9 @@ class Rental < ApplicationRecord validates :end_date, presence: true validate :valid_date_range + belongs_to :customer + belongs_to :movie + def valid_date_range if start_date < end_date return true @@ -10,4 +13,8 @@ def valid_date_range errors.add(:start_date, "Can't be after end date.") end + + def + end + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 6bc349c36..e5f10cbbf 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -17,4 +17,12 @@ end + describe "relationships" do + it " Customers have many rentals" do + customer = Customer.first + + customer.rentals + end + end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 66a4644f9..08d453c6b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -34,4 +34,12 @@ end end + + describe "relationships" do + it "has many rentals" do + movie = Movie.first + + movie.rentals + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index c2ae7cb50..805830d35 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,16 +1,37 @@ require "test_helper" describe Rental do - describe 'validations' do - before do - @movie = Movie.first - @customer = Customer.first - end + describe 'validations' do it 'must have a valid date range' do - rental = Rental.new(movie_id: @movie.id, customer_id: @customer.id, start_date: Date.today, end_date: Date.today - 1) + movie = Movie.first + customer = Customer.first + + rental = Rental.new(movie_id: movie.id, customer_id: customer.id, start_date: Date.today, end_date: Date.today - 1) rental.must_be_instance_of Rental rental.wont_be :valid? end end # validations -end + + describe "relationships" do + before do + @movie = Movie.first + @customer = Customer.first + @rental = Rental.new(customer_id: @customer.id, movie_id: @movie.id, start_date: Date.today, end_date: Date.today + 1) + + end + + it "belongs to a customer" do + + @rental.customer + @rental.customer.name.must_equal @customer.name + end + + it "belongs to a movie" do + + @rental.movie + @rental.movie.title.must_equal @movie.title + + end + end +end From e253ff9a1f22c1647049cc6570b71ad6a06fe21c Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Tue, 8 May 2018 11:02:41 -0700 Subject: [PATCH 09/27] added validation for renting with enough inventory --- app/models/rental.rb | 16 ++++++++++++++-- test/models/rental_test.rb | 19 ++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 64f4a83db..1c01ceea9 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,6 +2,7 @@ class Rental < ApplicationRecord validates :start_date, presence: true validates :end_date, presence: true validate :valid_date_range + validate :enough_inventory_for_rent belongs_to :customer belongs_to :movie @@ -14,7 +15,18 @@ def valid_date_range end - def + def enough_inventory_for_rent + range = start_date..end_date + count = 0 + self.movie.rentals.each do |rent| + if range.include?(rent.start_date) || range.include?(rent.end_date) + count += 1 + end + end + + if count >= self.movie.inventory + errors.add( :range,"All copies of the movie are rented for this date range") + end end - + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 805830d35..cdc47b70a 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -11,6 +11,23 @@ rental.must_be_instance_of Rental rental.wont_be :valid? end + + it "a rental can not be completed if all copies are rented for a date range" do + movie = Movie.first + customer = Customer.first + + movie.inventory.times do + rent = Rental.new(movie_id: movie.id, customer_id: customer.id, start_date: Date.today, end_date: Date.today + 1) + rent.save + end + movie.reload + + rental = Rental.new(movie_id: movie.id, customer_id: customer.id, start_date: Date.today, end_date: (Date.today + 1)) + + rental.wont_be :valid? + + end + end # validations describe "relationships" do @@ -34,4 +51,4 @@ end end -end +end From bc53918bc064394129fe5c1b5157542937ced0fc Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 8 May 2018 11:46:18 -0700 Subject: [PATCH 10/27] Created controllers; tested and wrote Customers index action --- app/controllers/customers_controller.rb | 6 ++++ app/controllers/movies_controller.rb | 2 ++ app/controllers/rentals_controller.rb | 2 ++ config/routes.rb | 1 + test/controllers/customers_controller_test.rb | 32 +++++++++++++++++++ test/controllers/movies_controller_test.rb | 7 ++++ test/controllers/rentals_controller_test.rb | 7 ++++ 7 files changed, 57 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..cec2faa45 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,6 @@ +class CustomersController < ApplicationController + def index + customers = Customer.where(name: params[:search]) + render json: customers.as_json(except: [:created_at, :updated_at, :id], status: :ok) + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..4104170e5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :customers, only: [:index, :show, :create] end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..7dcb57fd3 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,32 @@ +require "test_helper" + +describe CustomersController do + describe "index" do + it "returns an array of json" do + get customers_url + must_respond_with :success + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns customers with a name that matches the search" do + get customers_url, params: {search: "Bob Esponja"} + body = JSON.parse(response.body) + body.each do |customer| + customer["name"].must_equal "Bob Esponja" + end + end + + it "returns customers with exactly the required fields" do + keys = %w(address city name phone postal_code registered_at state) + get customers_url, params: {search: "Bob Esponja"} + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + + + end # index +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 3653d244b51b9c32806b325840054a615711b1f7 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 8 May 2018 12:04:31 -0700 Subject: [PATCH 11/27] added show controller action and tests for it --- app/controllers/customers_controller.rb | 14 ++++++++++ test/controllers/customers_controller_test.rb | 27 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index cec2faa45..00187ca56 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,4 +3,18 @@ def index customers = Customer.where(name: params[:search]) render json: customers.as_json(except: [:created_at, :updated_at, :id], status: :ok) end + + def show + customer = Customer.find_by(id: params[:id]) + + unless customer + render json: {errors: { + id: ["No customer with ID #{params[:id]}"] + } + }, status: :not_found + else + + render json: customer.as_json(except: [:created_at, :updated_at], status: :ok) + end + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 7dcb57fd3..ca82ad7d6 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -29,4 +29,31 @@ end # index + + describe "show" do + it "can get a customer" do + keys = %w(address city id name phone postal_code registered_at state ) + customer = Customer.first + get customer_path(customer.id) + must_respond_with :success + + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.keys.sort.must_equal keys + body['id'].must_equal customer.id + end + + it "it should return not found and returns some error test when a customer does not exist" do + keys = %w(address city id name phone postal_code registered_at state ) + customer_id = Customer.last.id + 1 + get customer_path(customer_id) + must_respond_with :not_found + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "id" + + end + end end From 838066e453bc2d60e26b361dfd91dc7086788ba6 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 8 May 2018 12:19:13 -0700 Subject: [PATCH 12/27] Test and write Customer create action --- app/controllers/customers_controller.rb | 16 +++++++++ test/controllers/customers_controller_test.rb | 34 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 00187ca56..03c4df969 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -17,4 +17,20 @@ def show render json: customer.as_json(except: [:created_at, :updated_at], status: :ok) end end + + def create + customer = Customer.new(customer_params) + if customer.save + render json: { id: customer.id }, status: :ok + else + render json: { + errors: customer.errors.messages + }, status: :bad_request + end + end + + private + def customer_params + return params.require(:customer).permit(:name, :address, :city, :state, :postal_code, :registered_at) + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ca82ad7d6..7d182fd44 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -56,4 +56,38 @@ end end + + describe "create" do + let(:customer_data) { + { + name: 'Patrick Star', + address: '123 Ocean St.', + city: 'Seattle', + state: 'Washington', + postal_code: '12345', + registered_at: Date.today + + } + } + + it "should create a new valid customer" do + old_customer_count = Customer.count + post customers_url, params: { customer: customer_data } + Customer.count.must_equal old_customer_count + 1 + newest_customer = Customer.last + newest_customer.name.must_equal customer_data[:name] + end + + it "should yield an error and error text when invalid data for customer" do + customer_data[:name] = nil + old_customer_count = Customer.count + post customers_url, params: { customer: customer_data } + Customer.count.must_equal old_customer_count + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "name" + end + end # create end From 6b8eae54ff1e946ea1edbe2a796ee43a231d645d Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 8 May 2018 13:57:02 -0700 Subject: [PATCH 13/27] Set up Movies Controller index tests --- app/controllers/movies_controller.rb | 9 ++++++ config/routes.rb | 2 ++ test/controllers/movies_controller_test.rb | 33 ++++++++++++++++++++-- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..9e163819e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,11 @@ class MoviesController < ApplicationController + + def index + movies = Movie.where(title: params[:title]) + + render json: movies.as_json(except: [:id, + + :created_at, :updated_at], status: :ok) + + end end diff --git a/config/routes.rb b/config/routes.rb index 4104170e5..36ba47a7a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :customers, only: [:index, :show, :create] + + resources :movies, only: [:index, :show, :create] end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..2b0cbbbce 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,34 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "returns an array of json" do + get movies_url + must_respond_with :success + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns movies with a name that matches the search" do + skip + get movies_url, params: {search: "Bob Esponja"} + body = JSON.parse(response.body) + body.each do |customer| + customer["name"].must_equal "Bob Esponja" + end + end + + it "returns movies with exactly the required fields" do + skip + keys = %w(address city name phone postal_code registered_at state) + get movies_url, params: {search: "Bob Esponja"} + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + + + end # index end From 021414e81a57108741d7a24b69b23e4abd5c3c1d Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Tue, 8 May 2018 14:11:41 -0700 Subject: [PATCH 14/27] Added a column in movies --- .../20180508165906_change_typo_in_previous_migration.rb | 2 +- db/migrate/20180508210416_add_column_to_customers.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20180508210416_add_column_to_customers.rb diff --git a/db/migrate/20180508165906_change_typo_in_previous_migration.rb b/db/migrate/20180508165906_change_typo_in_previous_migration.rb index e056745c1..bb9766b3b 100644 --- a/db/migrate/20180508165906_change_typo_in_previous_migration.rb +++ b/db/migrate/20180508165906_change_typo_in_previous_migration.rb @@ -4,6 +4,6 @@ def change remove_column :rentals, :customers_id add_reference :rentals, :movie, foreign_key: true - add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :customers, foreign_key: true end end diff --git a/db/migrate/20180508210416_add_column_to_customers.rb b/db/migrate/20180508210416_add_column_to_customers.rb new file mode 100644 index 000000000..b56587cd4 --- /dev/null +++ b/db/migrate/20180508210416_add_column_to_customers.rb @@ -0,0 +1,5 @@ +class AddColumnToCustomers < ActiveRecord::Migration[5.1] + def change + add_column :movies, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 0b7ba952b..e92aa55a6 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: 20180508170243) do +ActiveRecord::Schema.define(version: 20180508210416) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,6 +34,7 @@ t.string "overview" t.date "release_date" t.integer "inventory" + t.integer "movies_checked_out_count", default: 0 end create_table "rentals", force: :cascade do |t| From c2f3dc382fcc96bcb1ebcdfac42f8914116ccc97 Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Tue, 8 May 2018 14:27:51 -0700 Subject: [PATCH 15/27] Fixed test and squema typo --- "\033[0m," | 0 "\033[0m]" | 0 app/controllers/customers_controller.rb | 2 +- ...212109_remove_a_column_in_movies_an_add_to_customers.rb | 7 +++++++ db/schema.rb | 4 ++-- test/controllers/customers_controller_test.rb | 6 +++--- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 "\033[0m," create mode 100644 "\033[0m]" create mode 100644 db/migrate/20180508212109_remove_a_column_in_movies_an_add_to_customers.rb diff --git "a/\033[0m," "b/\033[0m," new file mode 100644 index 000000000..e69de29bb diff --git "a/\033[0m]" "b/\033[0m]" new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 03c4df969..a0c0f7cd0 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.where(name: params[:search]) - render json: customers.as_json(except: [:created_at, :updated_at, :id], status: :ok) + render json: customers.as_json(except: [:created_at, :updated_at], status: :ok) end def show diff --git a/db/migrate/20180508212109_remove_a_column_in_movies_an_add_to_customers.rb b/db/migrate/20180508212109_remove_a_column_in_movies_an_add_to_customers.rb new file mode 100644 index 000000000..7a284a885 --- /dev/null +++ b/db/migrate/20180508212109_remove_a_column_in_movies_an_add_to_customers.rb @@ -0,0 +1,7 @@ +class RemoveAColumnInMoviesAnAddToCustomers < ActiveRecord::Migration[5.1] + def change + remove_column :movies, :movies_checked_out_count + + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index e92aa55a6..76df9245e 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: 20180508210416) do +ActiveRecord::Schema.define(version: 20180508212109) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "state" t.string "postal_code" t.string "phone" + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -34,7 +35,6 @@ t.string "overview" t.date "release_date" t.integer "inventory" - t.integer "movies_checked_out_count", default: 0 end create_table "rentals", force: :cascade do |t| diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 7d182fd44..20c6a356e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -19,7 +19,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(address city name phone postal_code registered_at state) + keys = %w(address city id movies_checked_out_count name phone postal_code registered_at state) get customers_url, params: {search: "Bob Esponja"} body = JSON.parse(response.body) body.each do |customer| @@ -32,7 +32,7 @@ describe "show" do it "can get a customer" do - keys = %w(address city id name phone postal_code registered_at state ) + keys = %w(address city id movies_checked_out_count name phone postal_code registered_at state ) customer = Customer.first get customer_path(customer.id) must_respond_with :success @@ -45,7 +45,7 @@ end it "it should return not found and returns some error test when a customer does not exist" do - keys = %w(address city id name phone postal_code registered_at state ) + customer_id = Customer.last.id + 1 get customer_path(customer_id) must_respond_with :not_found From a166d58de2a7b4c184c5aaf71460af51bad2f6e9 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 8 May 2018 14:31:01 -0700 Subject: [PATCH 16/27] Test Movies index action --- app/controllers/movies_controller.rb | 4 +--- test/controllers/movies_controller_test.rb | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9e163819e..61cb95e7b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,9 +3,7 @@ class MoviesController < ApplicationController def index movies = Movie.where(title: params[:title]) - render json: movies.as_json(except: [:id, - - :created_at, :updated_at], status: :ok) + render json: movies.as_json(except: [:created_at, :updated_at], status: :ok) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2b0cbbbce..ded00963a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -11,7 +11,6 @@ end it "returns movies with a name that matches the search" do - skip get movies_url, params: {search: "Bob Esponja"} body = JSON.parse(response.body) body.each do |customer| @@ -20,8 +19,7 @@ end it "returns movies with exactly the required fields" do - skip - keys = %w(address city name phone postal_code registered_at state) + keys = %w(id release_date title) get movies_url, params: {search: "Bob Esponja"} body = JSON.parse(response.body) body.each do |customer| From 12d8605795a9bac08cb9981e06adc512a1478420 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 8 May 2018 15:42:33 -0700 Subject: [PATCH 17/27] Set up Movies 'show' action and use RABL to display JSON --- Gemfile | 4 ++++ Gemfile.lock | 10 ++++++++++ app/controllers/movies_controller.rb | 5 +++++ app/models/movie.rb | 2 +- app/views/movies/index.json.rabl | 0 app/views/movies/show.rabl | 15 +++++++++++++++ config/initializers/rabl_init.rb | 4 ++++ test/controllers/movies_controller_test.rb | 5 ++++- 8 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 app/views/movies/index.json.rabl create mode 100644 app/views/movies/show.rabl create mode 100644 config/initializers/rabl_init.rb diff --git a/Gemfile b/Gemfile index 78bff8d26..946c8559c 100644 --- a/Gemfile +++ b/Gemfile @@ -25,6 +25,10 @@ gem 'puma', '~> 3.7' # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible # gem 'rack-cors' +gem 'rabl' +gem 'oj' +gem 'jbuilder' + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] diff --git a/Gemfile.lock b/Gemfile.lock index e547d2449..901c997dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,6 +51,9 @@ GEM 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,9 +75,11 @@ 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) + oj (3.6.0) pg (1.0.0) pry (0.11.3) coderay (~> 1.1.0) @@ -82,6 +87,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) @@ -139,12 +146,15 @@ PLATFORMS DEPENDENCIES byebug + jbuilder listen (>= 3.0.5, < 3.2) minitest-rails minitest-reporters + oj pg (>= 0.18, < 2.0) pry-rails puma (~> 3.7) + rabl rails (~> 5.1.6) spring spring-watcher-listen (~> 2.0.0) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 61cb95e7b..0c044a7c7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -6,4 +6,9 @@ def index render json: movies.as_json(except: [:created_at, :updated_at], status: :ok) end + + def show + @movie = Movie.find_by(id: params[:id]) + render 'movies/show' + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 9cad292ae..1d5e548d7 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord - validates :title, presence: true, uniqueness: true + validates :title, presence: true #, uniqueness: true validates :inventory, presence: true has_many :rentals end diff --git a/app/views/movies/index.json.rabl b/app/views/movies/index.json.rabl new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/movies/show.rabl b/app/views/movies/show.rabl new file mode 100644 index 000000000..85598e590 --- /dev/null +++ b/app/views/movies/show.rabl @@ -0,0 +1,15 @@ +object @movie + +attributes :title, :overview, :release_date, :inventory + +node(:available_inventory) { |movie| + checked_out_count = 0 + movie.rentals.each do |rental| + puts rental + rental_range = rental.start_date..rental.end_date + if rental_range.include?(Date.today) + checked_out_count += 1 + end + end + movie.inventory - checked_out_count +} diff --git a/config/initializers/rabl_init.rb b/config/initializers/rabl_init.rb new file mode 100644 index 000000000..ceb007188 --- /dev/null +++ b/config/initializers/rabl_init.rb @@ -0,0 +1,4 @@ +require 'rabl' +Rabl.configure do |config| + config.include_json_root = false +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ded00963a..bbca7ec19 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -27,6 +27,9 @@ end end - end # index + + describe "show" do + it "" + end # show end From 6692a5a5b7b79034d7ab9fbfc3a19032e83ad3a3 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 8 May 2018 16:17:26 -0700 Subject: [PATCH 18/27] Rewrite index action using RABL; render error if movie not found for show action --- app/controllers/movies_controller.rb | 16 +++++++++++----- app/views/movies/index.json.rabl | 0 app/views/movies/index.rabl | 2 ++ test/controllers/movies_controller_test.rb | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 app/views/movies/index.json.rabl create mode 100644 app/views/movies/index.rabl diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 0c044a7c7..d7128b175 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,14 +1,20 @@ class MoviesController < ApplicationController def index - movies = Movie.where(title: params[:title]) - - render json: movies.as_json(except: [:created_at, :updated_at], status: :ok) - + @movies = Movie.where(title: params[:title]) + render 'movies/index' end def show @movie = Movie.find_by(id: params[:id]) - render 'movies/show' + if @movie + render 'movies/show' + else + render json: { + errors: { + id: ["No movie with ID #{params[:id]}"] + } + }, status: :not_found + end end end diff --git a/app/views/movies/index.json.rabl b/app/views/movies/index.json.rabl deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/views/movies/index.rabl b/app/views/movies/index.rabl new file mode 100644 index 000000000..640f6c161 --- /dev/null +++ b/app/views/movies/index.rabl @@ -0,0 +1,2 @@ +collection @movies +extends 'movies/show' diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index bbca7ec19..895b3e894 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -30,6 +30,6 @@ end # index describe "show" do - it "" + end # show end From 1ba0d1a70fd426ee92b48a8b3a1d798c8b915e8d Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Tue, 8 May 2018 16:29:52 -0700 Subject: [PATCH 19/27] added some tests for movies show controller --- app/models/movie.rb | 2 +- app/views/movies/show.rabl | 2 +- test/controllers/movies_controller_test.rb | 36 ++++++++++++++++++---- test/models/movie_test.rb | 10 +----- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 1d5e548d7..78adb835a 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,5 @@ class Movie < ApplicationRecord - validates :title, presence: true #, uniqueness: true + validates :title, presence: true validates :inventory, presence: true has_many :rentals end diff --git a/app/views/movies/show.rabl b/app/views/movies/show.rabl index 85598e590..d43cff860 100644 --- a/app/views/movies/show.rabl +++ b/app/views/movies/show.rabl @@ -1,6 +1,6 @@ object @movie -attributes :title, :overview, :release_date, :inventory +attributes :title, :overview, :release_date, :inventory, :id node(:available_inventory) { |movie| checked_out_count = 0 diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 895b3e894..ee3b5f0a5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -13,23 +13,47 @@ it "returns movies with a name that matches the search" do get movies_url, params: {search: "Bob Esponja"} body = JSON.parse(response.body) - body.each do |customer| - customer["name"].must_equal "Bob Esponja" + body.each do |movie| + movie["name"].must_equal "Bob Esponja" end end it "returns movies with exactly the required fields" do - keys = %w(id release_date title) + keys = %w(available_inventory id inventory overview release_date title) get movies_url, params: {search: "Bob Esponja"} body = JSON.parse(response.body) - body.each do |customer| - customer.keys.sort.must_equal keys + body.each do |movie| + movie.keys.sort.must_equal keys end end end # index describe "show" do - + it "can get a movie" do + keys = %w(available_inventory id inventory overview release_date title ) + movie = Movie.first + get movie_path(movie.id) + must_respond_with :success + + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.keys.sort.must_equal keys + body['id'].must_equal movie.id + end + + it "it should return not found and returns some error test when movie does not exist" do + + movie_id = Movie.last.id + 1 + get movie_path(movie_id) + must_respond_with :not_found + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "id" + + end + end # show end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 08d453c6b..9fc1479f4 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -25,21 +25,13 @@ end - it "must have a unique name" do - movie = Movie.first - - other_movie = Movie.new(title: movie.title, inventory: 4) - - other_movie.wont_be :valid? - end - end describe "relationships" do it "has many rentals" do movie = Movie.first - movie.rentals + movie.rentals end end end From 99bbc92c562d3660adda21b951005c53c7dd30fb Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Tue, 8 May 2018 16:47:24 -0700 Subject: [PATCH 20/27] added tests for controller movie create and created create method --- app/controllers/movies_controller.rb | 25 +++- test/controllers/movies_controller_test.rb | 131 ++++++++++++++------- 2 files changed, 108 insertions(+), 48 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d7128b175..503424e10 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,8 +1,8 @@ class MoviesController < ApplicationController def index - @movies = Movie.where(title: params[:title]) - render 'movies/index' + @movies = Movie.where(title: params[:title]) + render 'movies/index' end def show @@ -14,7 +14,24 @@ def show errors: { id: ["No movie with ID #{params[:id]}"] } - }, status: :not_found + }, status: :not_found + end end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: {id: movie.id}, status: :ok + else + render json: {errors: movie.errors.messages}, status: :bad_request + end + + end + + private + def movie_params + return params.require(:movie).permit(:title, :overwiew, :inventory, :release_date) + end + end -end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ee3b5f0a5..c9b7019f3 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,59 +1,102 @@ require "test_helper" describe MoviesController do - describe "index" do - it "returns an array of json" do - get movies_url - must_respond_with :success - response.header['Content-Type'].must_include 'json' - body = JSON.parse(response.body) - body.must_be_kind_of Array - end + describe "index" do + it "returns an array of json" do + get movies_url + must_respond_with :success + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Array + end - it "returns movies with a name that matches the search" do - get movies_url, params: {search: "Bob Esponja"} - body = JSON.parse(response.body) - body.each do |movie| - movie["name"].must_equal "Bob Esponja" - end + it "returns movies with a name that matches the search" do + get movies_url, params: {search: "Bob Esponja"} + body = JSON.parse(response.body) + body.each do |movie| + movie["name"].must_equal "Bob Esponja" end + end - it "returns movies with exactly the required fields" do - keys = %w(available_inventory id inventory overview release_date title) - get movies_url, params: {search: "Bob Esponja"} - body = JSON.parse(response.body) - body.each do |movie| - movie.keys.sort.must_equal keys - end + it "returns movies with exactly the required fields" do + keys = %w(available_inventory id inventory overview release_date title) + get movies_url, params: {search: "Bob Esponja"} + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys end + end - end # index + end # index - describe "show" do - it "can get a movie" do - keys = %w(available_inventory id inventory overview release_date title ) - movie = Movie.first - get movie_path(movie.id) - must_respond_with :success + describe "show" do + it "can get a movie" do + keys = %w(available_inventory id inventory overview release_date title ) + movie = Movie.first + get movie_path(movie.id) + must_respond_with :success - response.header['Content-Type'].must_include 'json' - body = JSON.parse(response.body) - body.must_be_kind_of Hash - body.keys.sort.must_equal keys - body['id'].must_equal movie.id - end + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.keys.sort.must_equal keys + body['id'].must_equal movie.id + end - it "it should return not found and returns some error test when movie does not exist" do + it "it should return not found and returns some error test when movie does not exist" do - movie_id = Movie.last.id + 1 - get movie_path(movie_id) - must_respond_with :not_found - body = JSON.parse(response.body) - body.must_be_kind_of Hash - body.must_include "errors" - body["errors"].must_include "id" + movie_id = Movie.last.id + 1 + get movie_path(movie_id) + must_respond_with :not_found + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "id" - end + end + + end # show + describe "create" do + let(:movie_data) { + { + title: "Isle of Dogs", + overview: "great movie", + inventory: 3, + release_date: Date.today + } + } + + it "should create a new valid movie" do + old_movie_count = Movie.count + post movies_url, params: { movie: movie_data } + Movie.count.must_equal old_movie_count + 1 + newest_movie = Movie.last + newest_movie.title.must_equal movie_data[:title] + end + + it "should yield an error and error text when invalid title for movie" do + movie_data[:title] = nil + old_movie_count = Movie.count + post movies_url, params: { movie: movie_data } + Movie.count.must_equal old_movie_count + 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 + + it "should yield an error and error text when invalid inventory for movie" do + movie_data[:inventory] = nil + old_movie_count = Movie.count + post movies_url, params: { movie: movie_data } + Movie.count.must_equal old_movie_count + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "inventory" + end + end - end # show end From 0aee8636acb7b45c1139c68e751650520589ab61 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Wed, 9 May 2018 10:21:35 -0700 Subject: [PATCH 21/27] Test and write rental controller checkout action --- app/controllers/rentals_controller.rb | 18 +++++++ app/models/rental.rb | 19 ++++---- config/routes.rb | 2 + test/controllers/rentals_controller_test.rb | 53 +++++++++++++++++++-- 4 files changed, 81 insertions(+), 11 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..79844c117 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,20 @@ class RentalsController < ApplicationController + def checkout + rental = Rental.new(rental_params) + rental.start_date = Date.today + rental.end_date = Date.today + 7 + if rental.save + render json: {id: rental.id}, status: :ok + else + render json: { + errors: rental.errors.messages + }, status: :bad_request + end + + end + + private + def rental_params + return params.permit(:movie_id, :customer_id) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 1c01ceea9..2f575b646 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -17,15 +17,18 @@ def valid_date_range def enough_inventory_for_rent range = start_date..end_date - count = 0 - self.movie.rentals.each do |rent| - if range.include?(rent.start_date) || range.include?(rent.end_date) - count += 1 + if movie + count = 0 + self.movie.rentals.each do |rent| + if range.include?(rent.start_date) || range.include?(rent.end_date) + count += 1 + end end - end - - if count >= self.movie.inventory - errors.add( :range,"All copies of the movie are rented for this date range") + if count >= self.movie.inventory + errors.add( :range,"All copies of the movie are rented for this date range") + end + else + errors.add(:movie_id,"Movie does not exist.") end end diff --git a/config/routes.rb b/config/routes.rb index 36ba47a7a..db21b981b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,6 @@ resources :customers, only: [:index, :show, :create] resources :movies, only: [:index, :show, :create] + + get "/checkout", to: "rentals#checkout", as: "checkout" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..0fb72d79c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,54 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "checkout" do + it "creates a new rental" do + old_rentals_count = Rental.count + movie = Movie.first + customer = Customer.first + get checkout_path, params: { movie_id: movie.id, customer_id: customer.id } + response.header['Content-Type'].must_include 'json' + must_respond_with :success + Rental.count.must_equal old_rentals_count + 1 + Rental.last.movie_id.must_equal movie.id + Rental.last.customer_id.must_equal customer.id + Rental.last.start_date.must_equal Date.today + Rental.last.end_date.must_equal Date.today + 7 + end + + it "must respond with bad_request for a movie that DNE" do + old_rentals_count = Rental.count + movie_id = Movie.last.id + 1 + customer = Customer.first + get checkout_path, params: { movie_id: movie_id, customer_id: customer.id } + response.header['Content-Type'].must_include 'json' + must_respond_with :bad_request + Rental.count.must_equal old_rentals_count + end + + it "must respond with bad_request for a customer that DNE" do + old_rentals_count = Rental.count + movie = Movie.first + customer_id = Customer.last.id + 1 + get checkout_path, params: { movie_id: movie.id, customer_id: customer_id } + response.header['Content-Type'].must_include 'json' + must_respond_with :bad_request + Rental.count.must_equal old_rentals_count + end + + it "must respond with bad_request for a movie with no available inventory" do + movie = Movie.first + customer = Customer.first + movie.inventory.times do + Rental.create(movie_id: movie.id, customer_id: customer.id, start_date: Date.today, end_date: Date.today + 7) + end + movie.reload + old_rentals_count = Rental.count + + get checkout_path, params: { movie_id: movie.id, customer_id: customer.id } + response.header['Content-Type'].must_include 'json' + must_respond_with :bad_request + Rental.count.must_equal old_rentals_count + end + end # checkout end From 9db8e6f06044083069793ca3d37604dd783def64 Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Wed, 9 May 2018 10:31:53 -0700 Subject: [PATCH 22/27] Working on rental controller --- app/controllers/rentals_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 79844c117..b39c59d0e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,6 +13,8 @@ def checkout end + + private def rental_params return params.permit(:movie_id, :customer_id) From 07567bc34ccb7bdaa9f92b21d98481e8c2ad43c8 Mon Sep 17 00:00:00 2001 From: Winifred Irarrazaval Date: Wed, 9 May 2018 11:08:20 -0700 Subject: [PATCH 23/27] added controller actions and tests for checkin --- app/controllers/rentals_controller.rb | 30 ++++++++++++++----- config/routes.rb | 4 ++- ...73241_add_return_date_column_to_rentals.rb | 5 ++++ db/schema.rb | 3 +- test/controllers/rentals_controller_test.rb | 26 ++++++++++++++++ test/fixtures/customers.yml | 4 +-- test/fixtures/movies.yml | 2 +- test/fixtures/rentals.yml | 2 +- 8 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 db/migrate/20180509173241_add_return_date_column_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b39c59d0e..48c85ccb1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,15 +8,29 @@ def checkout else render json: { errors: rental.errors.messages - }, status: :bad_request + }, status: :bad_request + end + end - end + def checkin + rental = Rental.find_by(id: params[:rental_id]) + unless rental + render json: { + errors: {id: ["Invalid rental id"]} + }, status: :not_found + else + + rental.return_date = Date.today - + if rental.save + render json: {id: rental.id}, status: :ok + end + end + end - private - def rental_params - return params.permit(:movie_id, :customer_id) - end -end + private + def rental_params + return params.permit(:movie_id, :customer_id) + end + end diff --git a/config/routes.rb b/config/routes.rb index db21b981b..5307d80d7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,5 +4,7 @@ resources :movies, only: [:index, :show, :create] - get "/checkout", to: "rentals#checkout", as: "checkout" + get "/rentals/checkout", to: "rentals#checkout", as: "checkout" + + get "/rentals/checkin", to: "rentals#checkin", as: "checkin" end diff --git a/db/migrate/20180509173241_add_return_date_column_to_rentals.rb b/db/migrate/20180509173241_add_return_date_column_to_rentals.rb new file mode 100644 index 000000000..e22c88f6a --- /dev/null +++ b/db/migrate/20180509173241_add_return_date_column_to_rentals.rb @@ -0,0 +1,5 @@ +class AddReturnDateColumnToRentals < ActiveRecord::Migration[5.1] + def change + add_column :rentals, :return_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 76df9245e..27f1e921c 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: 20180508212109) do +ActiveRecord::Schema.define(version: 20180509173241) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -44,6 +44,7 @@ t.date "start_date" t.bigint "movie_id" t.bigint "customer_id" + t.date "return_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 0fb72d79c..3c8cab306 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -51,4 +51,30 @@ Rental.count.must_equal old_rentals_count end end # checkout + + describe "checkin" do + before do + @rental = Rental.create(movie_id: Movie.first.id, customer_id: Customer.first.id, start_date: Date.today, end_date: Date.today + 7) + end + it "should checkin a movie" do + + @rental.return_date.must_be_nil + + get checkin_path, params: {rental_id: @rental.id} + @rental.reload + @rental.return_date.must_equal Date.today + + end + + it "must respond with not_found for a rental that DNE" do + + rental_id = @rental.id + 1 + + get checkin_path, params: { rental_id: rental_id} + + response.header['Content-Type'].must_include 'json' + must_respond_with :not_found + + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 5a12da3e6..fef0bd4fe 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,8 +4,8 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: - name: Bob Esponja +bob: + name: Bob Esponja # column: value # two: {} diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 279164bb3..1083288d9 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,7 +4,7 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: +fauno: title: Laberinto del Fauno inventory: 3 overview: Great movie diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..5685dbf3c 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -5,7 +5,7 @@ # below each fixture, per the syntax in the comments below # one: {} -# column: value + # two: {} # column: value From c4198d3a6ddc924f96b0cc4e02e2e41fd4b7dad3 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Wed, 9 May 2018 11:14:50 -0700 Subject: [PATCH 24/27] Modify enough_inventory_for_rent method in Rentals to use return_date --- app/models/rental.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 2f575b646..371f967e8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -16,11 +16,10 @@ def valid_date_range def enough_inventory_for_rent - range = start_date..end_date if movie count = 0 self.movie.rentals.each do |rent| - if range.include?(rent.start_date) || range.include?(rent.end_date) + if rent.return_date.nil? count += 1 end end From 5197527ff0de6d4815954c7daf67cc48a4978b56 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Wed, 9 May 2018 11:56:07 -0700 Subject: [PATCH 25/27] Write available_inventory method for Movie model to use in show RABL page --- app/models/movie.rb | 12 +++++++++++- app/views/movies/show.rabl | 10 +--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 78adb835a..587f22a8a 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,15 @@ class Movie < ApplicationRecord - validates :title, presence: true + validates :title, presence: true validates :inventory, presence: true has_many :rentals + + def get_available_inventory + checked_out_count = 0 + self.rentals.each do |rental| + if rental.return_date.nil? + checked_out_count += 1 + end + end + return self.inventory - checked_out_count + end end diff --git a/app/views/movies/show.rabl b/app/views/movies/show.rabl index d43cff860..7f94f79b2 100644 --- a/app/views/movies/show.rabl +++ b/app/views/movies/show.rabl @@ -3,13 +3,5 @@ object @movie attributes :title, :overview, :release_date, :inventory, :id node(:available_inventory) { |movie| - checked_out_count = 0 - movie.rentals.each do |rental| - puts rental - rental_range = rental.start_date..rental.end_date - if rental_range.include?(Date.today) - checked_out_count += 1 - end - end - movie.inventory - checked_out_count + movie.get_available_inventory } From 5b59aed0f3c6f160150d615b9c6cdc8e282293d5 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Thu, 10 May 2018 23:50:18 -0700 Subject: [PATCH 26/27] Modify Movies and Customers controllers to meet smoke test requirements for Wave 2 --- app/controllers/customers_controller.rb | 18 +++++++++++------- app/controllers/movies_controller.rb | 8 ++++++-- test/controllers/movies_controller_test.rb | 6 +++--- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a0c0f7cd0..6c1634241 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,10 @@ class CustomersController < ApplicationController def index - customers = Customer.where(name: params[:search]) + if params[:search].nil? + customers = Customer.all + else + customers = Customer.where(name: params[:search]) + end render json: customers.as_json(except: [:created_at, :updated_at], status: :ok) end @@ -25,12 +29,12 @@ def create else render json: { errors: customer.errors.messages - }, status: :bad_request + }, status: :bad_request + end end - end - private - def customer_params - return params.require(:customer).permit(:name, :address, :city, :state, :postal_code, :registered_at) + private + def customer_params + return params.require(:customer).permit(:name, :address, :city, :state, :postal_code, :registered_at) + end end -end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 503424e10..d5d315ae5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,11 @@ class MoviesController < ApplicationController def index - @movies = Movie.where(title: params[:title]) + if params[:title].nil? + @movies = Movie.all + else + @movies = Movie.where(title: params[:title]) + end render 'movies/index' end @@ -31,7 +35,7 @@ def create private def movie_params - return params.require(:movie).permit(:title, :overwiew, :inventory, :release_date) + return params.permit(:title, :overwiew, :inventory, :release_date) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c9b7019f3..9d30e110b 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -11,10 +11,10 @@ end it "returns movies with a name that matches the search" do - get movies_url, params: {search: "Bob Esponja"} + get movies_url, params: {title: "Laberinto del Fauno"} body = JSON.parse(response.body) body.each do |movie| - movie["name"].must_equal "Bob Esponja" + movie["title"].must_equal "Laberinto del Fauno" end end @@ -68,7 +68,7 @@ it "should create a new valid movie" do old_movie_count = Movie.count - post movies_url, params: { movie: movie_data } + post movies_url, params: movie_data Movie.count.must_equal old_movie_count + 1 newest_movie = Movie.last newest_movie.title.must_equal movie_data[:title] From ee709726794cc2e70213933c400961ee311fe1b2 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Fri, 11 May 2018 12:23:48 -0700 Subject: [PATCH 27/27] Modify Rentals controller to meet smoke test requirements for Wave 3; modify tests accordingly --- .gitignore | 1 + app/controllers/rentals_controller.rb | 48 +++++++++++++-------- config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 17 ++++---- 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 68ac019ec..aeeab93e5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ !/tmp/.keep .byebug_history +.DS_Store diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 48c85ccb1..593c4f1a4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,36 +1,46 @@ class RentalsController < ApplicationController + def checkout + customer_id = params[:customer_id] rental = Rental.new(rental_params) rental.start_date = Date.today rental.end_date = Date.today + 7 + if rental.save + customer = Customer.find_by(id: customer_id) + customer.movies_checked_out_count += 1 + customer.save render json: {id: rental.id}, status: :ok else render json: { errors: rental.errors.messages }, status: :bad_request - end - end + end # checkout - def checkin - rental = Rental.find_by(id: params[:rental_id]) - unless rental - render json: { - errors: {id: ["Invalid rental id"]} - }, status: :not_found - else - - rental.return_date = Date.today + def checkin + rental = Rental.find_by(movie_id: params[:movie_id], customer_id: params[:customer_id]) - if rental.save - render json: {id: rental.id}, status: :ok - end + unless rental + render json: { + errors: { + id: ["Invalid rental id"] + } + }, status: :not_found + else + rental.return_date = Date.today + if rental.save + customer = Customer.find_by(id: rental.customer_id) + customer.movies_checked_out_count -= 1 + customer.save + render json: {id: rental.id}, status: :ok end end + end # checkin - private - def rental_params - return params.permit(:movie_id, :customer_id) - end - end + private + def rental_params + return params.permit(:movie_id, :customer_id) + end + +end # RentalsController diff --git a/config/routes.rb b/config/routes.rb index 5307d80d7..370d43cdd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,7 @@ resources :movies, only: [:index, :show, :create] - get "/rentals/checkout", to: "rentals#checkout", as: "checkout" + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" - get "/rentals/checkin", to: "rentals#checkin", as: "checkin" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3c8cab306..0b8fe674f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -6,7 +6,7 @@ old_rentals_count = Rental.count movie = Movie.first customer = Customer.first - get checkout_path, params: { movie_id: movie.id, customer_id: customer.id } + post checkout_path, params: { movie_id: movie.id, customer_id: customer.id } response.header['Content-Type'].must_include 'json' must_respond_with :success Rental.count.must_equal old_rentals_count + 1 @@ -20,7 +20,7 @@ old_rentals_count = Rental.count movie_id = Movie.last.id + 1 customer = Customer.first - get checkout_path, params: { movie_id: movie_id, customer_id: customer.id } + post checkout_path, params: { movie_id: movie_id, customer_id: customer.id } response.header['Content-Type'].must_include 'json' must_respond_with :bad_request Rental.count.must_equal old_rentals_count @@ -30,7 +30,7 @@ old_rentals_count = Rental.count movie = Movie.first customer_id = Customer.last.id + 1 - get checkout_path, params: { movie_id: movie.id, customer_id: customer_id } + post checkout_path, params: { movie_id: movie.id, customer_id: customer_id } response.header['Content-Type'].must_include 'json' must_respond_with :bad_request Rental.count.must_equal old_rentals_count @@ -45,7 +45,7 @@ movie.reload old_rentals_count = Rental.count - get checkout_path, params: { movie_id: movie.id, customer_id: customer.id } + post checkout_path, params: { movie_id: movie.id, customer_id: customer.id } response.header['Content-Type'].must_include 'json' must_respond_with :bad_request Rental.count.must_equal old_rentals_count @@ -60,7 +60,7 @@ @rental.return_date.must_be_nil - get checkin_path, params: {rental_id: @rental.id} + post checkin_path, params: { movie_id: @rental.movie_id, customer_id: @rental.customer_id } @rental.reload @rental.return_date.must_equal Date.today @@ -68,10 +68,11 @@ it "must respond with not_found for a rental that DNE" do - rental_id = @rental.id + 1 + movie_id = Movie.last.id + 1 + customer_id = Customer.last.id + 1 + + post checkin_path, params: { movie_id: movie_id, customer_id: customer_id} - get checkin_path, params: { rental_id: rental_id} - response.header['Content-Type'].must_include 'json' must_respond_with :not_found