From 4fb27ff3d062795220c9768d9b9f0b19921ea5b7 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Tue, 9 May 2017 14:31:49 -0700 Subject: [PATCH 01/65] generated controllers? models? seeeds --- .gitignore | 17 ++ Gemfile | 53 ++++ Gemfile.lock | 175 +++++++++++ README.md | 282 +----------------- Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 2 + app/models/movie.rb | 2 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 34 +++ bin/spring | 17 ++ bin/update | 29 ++ config.ru | 5 + config/application.rb | 34 +++ config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++ config/environments/production.rb | 78 +++++ config/environments/test.rb | 42 +++ .../application_controller_renderer.rb | 6 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/new_framework_defaults.rb | 18 ++ config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 23 ++ config/puma.rb | 47 +++ config/routes.rb | 3 + config/secrets.yml | 22 ++ config/spring.rb | 6 + db/migrate/20170509212639_create_customers.rb | 14 + db/migrate/20170509212649_create_movies.rb | 11 + db/schema.rb | 39 +++ db/seeds.rb | 14 +- lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/controllers/customers_controller_test.rb | 7 + test/controllers/movies_controller_test.rb | 7 + test/fixtures/.keep | 0 test/fixtures/customers.yml | 11 + test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 11 + test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 9 + test/models/movie_test.rb | 9 + test/test_helper.rb | 26 ++ tmp/.keep | 0 68 files changed, 1056 insertions(+), 276 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/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/new_framework_defaults.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/migrate/20170509212639_create_customers.rb create mode 100644 db/migrate/20170509212649_create_movies.rb create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/movies.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..48fb168f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore Byebug command history file. +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..0ed2648fb --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.2' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri +end + +group :development do + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development do + gem 'better_errors' + gem 'pry-rails' +end + +gem 'awesome_print' +gem 'foundation-rails' +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..dc0da7400 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (7.1.4) + awesome_print (1.7.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + builder (3.2.3) + byebug (9.0.6) + coderay (1.1.1) + concurrent-ruby (1.0.5) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + foundation-rails (6.3.1.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.14) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + pg (0.20.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.8.2) + rack (2.0.2) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + ruby-progressbar (1.8.1) + sass (3.4.23) + slop (3.6.0) + spring (2.0.1) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + awesome_print + better_errors + byebug + foundation-rails + listen (~> 3.0.5) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.0) + rails (~> 5.0.2) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.14.6 diff --git a/README.md b/README.md index fb85e2b48..7db80e4ca 100644 --- a/README.md +++ b/README.md @@ -1,280 +1,24 @@ -# Project: VideoStoreAPI -The goal of this project is to create a system that a video store (remember those?) could use to track their inventory of rental videos and their list of customers. +# README -We will use Rails to construct a RESTful API. The purpose of this API is to quickly serve information about the store's video collection, customer information, and to update rental status. This repository provides two JSON datafiles to serve as the initial seeds for this system. +This README would normally document whatever steps are necessary to get the +application up and running. -This is a pair project. You and your partner should use all the techniques we've learned so far to keep yourselves organized and on track, and ensure that no requirements slip through the cracks. +Things you may want to cover: -## Learning Goals -Upon completing this project, students should be able to: +* Ruby version -- Build an ERD and set up ActiveRecord models for a given dataset / use-case -- Expose database contents through a web API -- Respond reasonably to bad user data in the context of an API -- Verify the correctness of an API using controller tests +* System dependencies -This is a [stage 2](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) project. +* Configuration -## Success Criteria -Your project will be evaluated against the following requirements: +* Database creation -- API conformance - - The provided smoke tests should pass (see the subfolder) - - Bad data sent to the API should result in an appropriate status code and helpful error -- Test coverage - - Models: All relations, validations, and custom model methods should include at least one positive and one negative test case - - Controllers: Every API endpoint should include at least one positive and one negative test case -- Style and Organization - - Business logic should be live in models +* Database initialization -## Project Baseline -- Read the API Requirements below and create a pseudo-code "routes" file that specifies - - The _endpoints_ your API will need - - The _HTTP verbs_ each endpoint will use - - Any data that must be provided to the endpoint in order for it to do its work -- Read the Seed Data description below and, bearing in mind the API Requirements, create an ERD for your database that specifies - - The _models_ your database will require - - The _attributes_ for each model - - Any _relationships_ between models -- Create a new Rails app to serve as the API - - **Create the rails app with:** `$ rails new . --api` -- Create a route that responds to `/zomg` that serves a json-encoded "it works!" +* How to run the test suite -## Wave 1: Database Models, Tables, & Seeds -- Generate Rails models and associations to match your ERD -- Use the provided seed script `db/seeds.rb` to import the provided JSON data into your database +* Services (job queues, cache servers, search engines, etc.) -### Seed Data -`movies.json` contains information about the videos available to rent at the store. The data is presented as an array of objects, with each object having the following key-value pairs: +* Deployment instructions -| Field | Datatype | Description -|----------------|----------|------------ -| `title` | string | The title of the film -| `overview` | string | A short plot synopsis -| `release_date` | string | `YYYY-MM-DD`, Day the film was originally released -| `inventory` | integer | How many copies of the film the video store owns - -`customers.json` contains information about the customers that have rented with the store in the past. The data is presented as, you guessed it, an array of objects, with each object have the following key-value pairs: - -| Field | Datatype | Description -|------------------|----------|------------ -| `name` | string | The customer's name -| `registered_at` | string | `Wed, 29 Apr 2015 07:54:14 -0700`, When the customer first visited the store -| `address` | string | Street address -| `city` | string |   -| `state` | string |   -| `postal_code` | string |   -| `phone` | string | Primary contact phone number - -### Testing -As with all Rails projects, model testing is a requirement. You should have _at least_ one positive and one negative test case for each relation, validation, and custom function you add to your models. - -Use good TDD practices, and test _before_ you code. Remember: red-green-refactor. - -## Waves 2 Coding The API -In this wave, you will implement the API described below. The endpoints are described more-or-less in order of complexity, and we recommend you build them in that order. Every endpoint must serve JSON data, and must use HTTP response codes to indicate the status of the request. - -The schema of your database and the structure of your rails app are completely up to you, so long as the API conforms to the description and provided script. - -### Error Handling -If something goes wrong, your API should return an appropriate [HTTP status code](http://billpatrianakos.me/blog/2013/10/13/list-of-rails-status-code-symbols/), as well as a list of errors. The list should be formatted like this: - -```json -{ - "errors": { - "title": ["Movie 'Revenge of the Gnomes' not found"] - } -} -``` - -All errors your API can return should be covered by at least one test case. - -### Testing -Because APIs are often open to the public, thorough testing is essential. For a Rails API, that means controller testing. - -For each API endpoint, you should have _at least_: -- A basic test with no parameters, if applicable -- Positive and negative tests for any URI parameters (user ID, movie title) -- Testing around any data in the request body - -Use good TDD practices, and test _before_ you code. Remember: red-green-refactor. - -#### Smoke Tests -Because this API will be used as the backend for a future project, there are strict requirements about how it should be structured. To this end, we have provided a set of [smoke tests](http://softwaretestingfundamentals.com/smoke-testing/) written in Postman to exercise all the endpoints. - -The smoke tests will verify that your API looks correct to the outside world, by sending actual HTTP requests to your running server and checking the results. They test things like: - -- Did I get a success response for a valid request? -- Did the API return JSON? -- Does the JSON contain the expected property names? - -**The smoke tests are not a substitute for writing your own tests!!!!!** They do **not** check that the content is _correct_, nor do they cover any negative or edge cases. Verifying correctness in these cases is **your** responsibility. - -The smoke tests live in the file [`test/VideoStoreAPI_smoke_tests.postman_collection.json`](test/VideoStoreAPI_smoke_tests.postman_collection.json). To run them: - -1. Open Postman -1. Click `Import` in the top left -1. Drag-and-drop the file into the box -1. In the left sidebar, click on the `Collections` tab -1. There should now be an entry for the smoke tests. Hover over it and click the `>` icon for a detail view. -1. Click the blue `Run` button. This will launch the collection runner. -1. In the collection runner, scroll down in the center pane and click the blue `Start Test` button - -## API Description - -#### `GET /customers` -List all customers - -Fields to return: -- `id` -- `name` -- `registered_at` -- `postal_code` -- `phone` -- `movies_checked_out_count` - - This will be 0 unless you've completed optional requirements - -#### `GET /movies` -List all movies - -Fields to return: -- `title` -- `release_date` - -#### `GET /movies/:title` -Look a movie up by `title` - -URI parameters: -- `title`: Movie title (e.g. `Jaws`) - -Fields to return: -- `title` -- `overview` -- `release_date` -- `inventory` (total) -- `available_inventory` (not currently checked-out to a customer) - - This will be the same as `inventory` unless you've completed the optional endpoints. - -### Optional Rentals - -Wave 2 focused on **reading** data from the API. In these endpoints you will interact with the API changing models through POST requests. - -#### `POST /rentals/:title/check-out` -Check out one of the movie's inventory to the customer. The rental's check-out date should be set to today. - -**Note:** Some of the fields from wave 2 should now have interesting values. Good thing you wrote tests for them, right... right? - -URI parameters: -- `title`: Movie title (e.g. `Jaws`) - -Request body: - -| Field | Datatype | Description -|---------------|---------------------|------------ -| `customer_id` | integer | ID of the customer checking out this film -| `due_date` | string `YYYY-MM-DD` | When should this movie be checked back in? - -#### `POST /rentals/:title/check-in` -Check in one of a customer's rentals - -Request body: - -| Field | Datatype | Description -|---------------|----------|------------ -| `customer_id` | integer | ID of the customer checking in this film - -#### `GET /rentals/overdue` -List all customers with overdue movies - -Fields to return: -- `title` -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -## Going Further -These really are **optional** - if you've gotten here and you have time left, that means you're moving speedy fast! - -### Query Parameters -Any endpoint that returns a list should accept 3 _optional_ [query parameters](http://guides.rubyonrails.org/action_controller_overview.html#parameters): - -| Name | Value | Description -|--------|---------|------------ -| `sort` | string | Sort objects by this field, in ascending order -| `n` | integer | Number of responses to return per page -| `p` | integer | Page of responses to return - -So, for an API endpoint like `GET /customers`, the following requests should be valid: -- `GET /customers`: All customers, sorted by ID -- `GET /customers?sort=name`: All customers, sorted by name -- `GET /customers?n=10&p=2`: Customers 10-19, sorted by ID -- `GET /customers?sort=name&n=10&p=2`: Customers 10-19, sorted by name - -Of course, adding new features means you should be adding new controller tests to verify them. - -Things to note: -- Sorting by ID is the rails default -- Possible sort fields: - - Customers can be sorted by `name`, `registered_at` and `postal_code` - - Movies can be sorted by `title` and `release_date` - - Overdue rentals can be sorted by `title`, `name`, `checkout_date` and `due_date` -- If the client requests both sorting and pagination, pagination should be relative to the sorted order -- Check out the [will_paginate gem](https://github.com/mislav/will_paginate) - -### More Endpoints: Inventory Management -All these endpoints should support all 3 query parameters. All fields are sortable. - -#### `GET /movies/:title/current` -List customers that have _currently_ checked out a copy of the film - -URI parameters: -- `title`: Movie title (e.g. `Jaws`) - -Fields to return: -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /movies/:title/history` -List customers that have checked out a copy of the film _in the past_ - -URI parameters: -- `title`: Movie title (e.g. `Jaws`) - -Fields to return: -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /customers/:id/current` -List the movies a customer _currently_ has checked out - -URI parameters: -- `id`: Customer ID - -Fields to return: -- `title` -- `checkout_date` -- `due_date` - -#### `GET /customers/:id/history` -List the movies a customer has checked out _in the past_ - -URI parameters: -- `id`: Customer ID - -Fields to return: -- `title` -- `checkout_date` -- `due_date` - - -# Reference -- [Postman on Environments](https://www.getpostman.com/docs/environments) - \ No newline at end of file +* ... diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..e620b4dad --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..4fbf1ef3a --- /dev/null +++ b/config/application.rb @@ -0,0 +1,34 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + # Force new test files to be generated in the minitest-spec style + config.generators do |g| + g.test_framework :minitest, spec: true + end + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0bbde6f74 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..aead51124 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..082a013ab --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..49275a9d6 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,78 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..30587ef6d --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..51639b67a --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..d859e4bea --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,18 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..c7f311f81 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum, this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..239614db0 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: 0c18084594d221ebed85d84e0f6135d42e7089bd3dfa15587fe5d6466394cf1674795d42a0f3196c7be4a06596bb3a8276f96550a45140f47444df4cf358c315 + +test: + secret_key_base: 44307eb86b04672d8cecf06efb074f0d47355779f30a83912984b2f995fbc7cf5238840dde861ff2b3215aa243571c0075d3a2aa9eed1d12106865f7ee2698aa + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/migrate/20170509212639_create_customers.rb b/db/migrate/20170509212639_create_customers.rb new file mode 100644 index 000000000..d365d8ff0 --- /dev/null +++ b/db/migrate/20170509212639_create_customers.rb @@ -0,0 +1,14 @@ +class CreateCustomers < ActiveRecord::Migration[5.0] + def change + create_table :customers do |t| + t.string :name + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + t.string :registered_at + t.timestamps + end + end +end diff --git a/db/migrate/20170509212649_create_movies.rb b/db/migrate/20170509212649_create_movies.rb new file mode 100644 index 000000000..b9c672a11 --- /dev/null +++ b/db/migrate/20170509212649_create_movies.rb @@ -0,0 +1,11 @@ +class CreateMovies < ActiveRecord::Migration[5.0] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..ed7f30fd5 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# 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: 20170509212649) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.string "registered_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end 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..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..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/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..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/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..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/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..cc375119f --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" + require "minitest/reporters" # for Colorized output + + # For colorful output! + Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter + ) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb From b4031ae95b1fd76a654b115f2fdb075bf595f649 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 9 May 2017 14:49:47 -0700 Subject: [PATCH 02/65] added missing fields to db tables --- db/migrate/20170509212639_create_customers.rb | 1 + db/migrate/20170509212649_create_movies.rb | 1 + db/schema.rb | 10 ++++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/db/migrate/20170509212639_create_customers.rb b/db/migrate/20170509212639_create_customers.rb index d365d8ff0..12441a3db 100644 --- a/db/migrate/20170509212639_create_customers.rb +++ b/db/migrate/20170509212639_create_customers.rb @@ -8,6 +8,7 @@ def change t.string :postal_code t.string :phone t.string :registered_at + t.integer :movies_checked_out_count, default: 0 t.timestamps end end diff --git a/db/migrate/20170509212649_create_movies.rb b/db/migrate/20170509212649_create_movies.rb index b9c672a11..4596922dc 100644 --- a/db/migrate/20170509212649_create_movies.rb +++ b/db/migrate/20170509212649_create_movies.rb @@ -5,6 +5,7 @@ def change t.string :overview t.string :release_date t.integer :inventory + t.integer :available_invetory, default: 0 t.timestamps end end diff --git a/db/schema.rb b/db/schema.rb index ed7f30fd5..0bc7a737c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -23,8 +23,9 @@ t.string "postal_code" t.string "phone" t.string "registered_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "movies", force: :cascade do |t| @@ -32,8 +33,9 @@ t.string "overview" t.string "release_date" t.integer "inventory" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "available_invetory", default: 0 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end end From 0bf828776e0a2bf8bf79a2bcdd9bff967de146bc Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 9 May 2017 15:09:25 -0700 Subject: [PATCH 03/65] seeded customer data --- Gemfile | 2 +- Gemfile.lock | 5 +++++ db/seeds.rb | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0ed2648fb..731adf181 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'pg', '~> 0.18' # Use Puma as the app server gem 'puma', '~> 3.0' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -# gem 'jbuilder', '~> 2.5' +gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production # gem 'redis', '~> 3.0' # Use ActiveModel has_secure_password diff --git a/Gemfile.lock b/Gemfile.lock index dc0da7400..0f180409d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,6 +63,9 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.1) + jbuilder (2.6.3) + activesupport (>= 3.0.0, < 5.2) + multi_json (~> 1.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -84,6 +87,7 @@ GEM builder minitest (>= 5.0) ruby-progressbar + multi_json (1.12.1) nio4r (2.0.0) nokogiri (1.7.1) mini_portile2 (~> 2.1.0) @@ -160,6 +164,7 @@ DEPENDENCIES better_errors byebug foundation-rails + jbuilder (~> 2.5) listen (~> 3.0.5) minitest-rails minitest-reporters diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2acc..ba349f0f4 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,12 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) +# require 'json' +raw_data = File.read( Rails.root.join('db', 'seeds', 'customers.json')) +customers = JSON.parse(raw_data) + +customers.each do |customer| + p customer + customer.delete('account_credit') + Customer.create(customer) +end From b5a313af8ba34340aa3c465d9861fabf226cf78d Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Tue, 9 May 2017 15:09:39 -0700 Subject: [PATCH 04/65] seeded movies data --- Gemfile | 2 +- Gemfile.lock | 5 +++++ config/routes.rb | 2 ++ db/seeds.rb | 7 +++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0ed2648fb..731adf181 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'pg', '~> 0.18' # Use Puma as the app server gem 'puma', '~> 3.0' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -# gem 'jbuilder', '~> 2.5' +gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production # gem 'redis', '~> 3.0' # Use ActiveModel has_secure_password diff --git a/Gemfile.lock b/Gemfile.lock index dc0da7400..0f180409d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,6 +63,9 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.1) + jbuilder (2.6.3) + activesupport (>= 3.0.0, < 5.2) + multi_json (~> 1.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -84,6 +87,7 @@ GEM builder minitest (>= 5.0) ruby-progressbar + multi_json (1.12.1) nio4r (2.0.0) nokogiri (1.7.1) mini_portile2 (~> 2.1.0) @@ -160,6 +164,7 @@ DEPENDENCIES better_errors byebug foundation-rails + jbuilder (~> 2.5) listen (~> 3.0.5) minitest-rails minitest-reporters diff --git a/config/routes.rb b/config/routes.rb index 787824f88..58c807462 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ 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/db/seeds.rb b/db/seeds.rb index 1beea2acc..70bc8bb5f 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) + +raw_data = File.read(Rails.root.join("db", "seeds", "movies.json")) +movies = JSON.parse(raw_data) + +movies.each do |movie| + Movie.create(movie) +end From 7e6293c384f5057a3cfd3e11c9a66ba6c3c87289 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 9 May 2017 15:21:15 -0700 Subject: [PATCH 05/65] added movie validations in model --- app/models/movie.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..b0f97568e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,7 @@ class Movie < ApplicationRecord + validates :title, presence: true, uniqueness: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true, numericality: { greater_than: -1 } + validates :available_invetory, presence: true, numericality: { greater_than: -1 } end From 04f4c21a283bd95accef32e52f25a77a59c811fc Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 9 May 2017 15:32:24 -0700 Subject: [PATCH 06/65] added movie fixtures --- test/fixtures/movies.yml | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index dc3ee79b5..358b92346 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,26 @@ # 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 +one: + title: Psycho + overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. + release_date: 1960-06-16 + inventory: 8 + +two: + title: Psycho + overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. + release_date: 1960-06-16 + inventory: 8 + +three: + title: Jaws + overview: An insatiable great white shark terrorizes the townspeople of Amity Island, The police chief, an oceanographer and a grizzled shark hunter seek to destroy the bloodthirsty beast. + release_date: 1975-06-19 + inventory: 6 + +four: + title: The Exorcist + overview: 12-year-old Regan MacNeil begins to adapt an explicit new personality as strange events befall the local area of Georgetown. Her mother becomes torn between science and superstition in a desperate bid to save her daughter, and ultimately turns to her last hope: Father Damien Karras, a troubled priest who is struggling with his own faith. + release_date: 1973-12-26 + inventory: 7 From 60170ce7e699f814f8646bd1403df6229e686943 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 9 May 2017 15:54:48 -0700 Subject: [PATCH 07/65] added movie validation tests --- test/fixtures/movies.yml | 6 ---- test/models/customer_test.rb | 8 ----- test/models/movie_test.rb | 65 +++++++++++++++++++++++++++++++++--- 3 files changed, 61 insertions(+), 18 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 358b92346..c5065ae03 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -21,9 +21,3 @@ three: overview: An insatiable great white shark terrorizes the townspeople of Amity Island, The police chief, an oceanographer and a grizzled shark hunter seek to destroy the bloodthirsty beast. release_date: 1975-06-19 inventory: 6 - -four: - title: The Exorcist - overview: 12-year-old Regan MacNeil begins to adapt an explicit new personality as strange events befall the local area of Georgetown. Her mother becomes torn between science and superstition in a desperate bid to save her daughter, and ultimately turns to her last hope: Father Damien Karras, a troubled priest who is struggling with his own faith. - release_date: 1973-12-26 - inventory: 7 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..0ad635fec 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1 @@ 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 index 34d1d30a5..9b7a59b88 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,66 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } - it "must be valid" do - value(movie).must_be :valid? - end + describe 'validations' do + before do + @input = { title: "Harry Potter", + overview: "Boy learns he is a wizard", + release_date: "11-23-2001", + inventory: 10 + } + end + + # is this more dry? + def create_movie(info) + return Movie.new(info) + end + + it 'good data passes validations' do + movie = create_movie(@input) + movie.valid?.must_equal true + end + + it 'does not allow duplicate titles' do + Movie.create(@input) + repeat = Movie.new(@input) + repeat.valid?.must_equal false + repeat.errors.must_include :title + end + + it 'has to include an overview' do + @input.delete(:overview) + movie_no_overview = Movie.new(@input) + movie_no_overview.valid?.must_equal false + movie_no_overview.errors.must_include :overview + end + + it 'has to include a release data' do + @input.delete(:release_date) + movie_no_date = Movie.new(@input) + movie_no_date.valid?.must_equal false + movie_no_date.errors.must_include :release_date + end + + it 'has to include inventory integer' do + @input.delete(:inventory) + movie_no_inv = Movie.new(@input) + movie_no_inv.valid?.must_equal false + movie_no_inv.errors.must_include :inventory + end + + it "can't include a negative inventory" do + @input[:inventory] = -3 + movie = create_movie(@input) + movie.valid?.must_equal false + movie.errors.must_include :inventory + end + + it 'inventory has to be a integer' do + @input[:inventory] = "one" + movie = Movie.new(@input) + movie.valid?.must_equal false + movie.errors.must_include :inventory + end + end end From dbdf7af5e57c5df8f35198dc79146934de02bfd5 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 9 May 2017 16:16:33 -0700 Subject: [PATCH 08/65] working on movies index method and testing --- app/controllers/movies_controller.rb | 4 ++++ config/routes.rb | 3 ++- test/controllers/movies_controller_test.rb | 20 +++++++++++++++++--- test/models/movie_test.rb | 8 ++++---- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..b3dc2ef8d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,6 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render json: movies.as_json(only: [:title, :release_date]), status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index 58c807462..b6f3f63a1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - + get 'movies', to: 'movies#index', as: 'movies' + get 'movies/:id', to: 'movies#show', as: 'movie' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..6933663cb 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,21 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe 'Index' do + + it 'is a real working api route' do + get movies_path + must_respond_with :success + end + + it 'returns json' do + get movies_path + response.header['Content-Type'].must_include 'json' + end + + it 'returns an array' do + get movies_path + response.parsed_body.must_be_instance_of Array + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 9b7a59b88..f8e8013d2 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -5,10 +5,10 @@ describe 'validations' do before do @input = { title: "Harry Potter", - overview: "Boy learns he is a wizard", - release_date: "11-23-2001", - inventory: 10 - } + overview: "Boy learns he is a wizard", + release_date: "11-23-2001", + inventory: 10 + } end # is this more dry? From 15a70a5777072acf9f261c68519aa0f8c198580f Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Tue, 9 May 2017 16:25:02 -0700 Subject: [PATCH 09/65] added tests for model Customer and customers controller --- app/controllers/customers_controller.rb | 20 +++++ app/models/customer.rb | 15 ++++ config/routes.rb | 3 +- test/controllers/customers_controller_test.rb | 37 ++++++++- test/fixtures/customers.yml | 77 +++++++++++++++++++ test/models/customer_test.rb | 68 +++++++++++++++- 6 files changed, 213 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..c7a20d8ed 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,22 @@ class CustomersController < ApplicationController + + def index + customers = Customer.all + if customers.empty? + render status: :not_found, json: { errors: "Cannot find customers" } + else + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + end + end + + def show + customer = Customer.find_by(id: params[:id]) + if customer == nil + render status: :not_found, json: { errors: "Cannot find a customer with id #{params[:id]}" } + else + render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + end + end + + end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..1d8da9475 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,17 @@ class Customer < ApplicationRecord + + validates :name, presence: true + + validates :registered_at,presence: true + + validates :address,presence: true + + validates :city,presence: true, format: { with: /\A[a-zA-Z]+\z/ } + + validates :state,presence: true, format: { with: /\A[a-zA-Z]+\z/} + + validates :postal_code,presence: true, numericality: true, length: { is: 5 } + + validates :phone,presence: true, format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}\z/ } + end diff --git a/config/routes.rb b/config/routes.rb index 58c807462..0137aeb92 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - + get "customers", to: "customers#index", as: "customers" + get "customers/:id", to: "customers#show" # , as: "customer" end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..98d4ea2f1 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,38 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "route is working" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array class object" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(id movies_checked_out_count name phone postal_code registered_at ) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dc3ee79b5..b5acb710b 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -9,3 +9,80 @@ one: {} # two: {} # column: value + +good_customer: + name: natalia kuleniuk + registered_at: May 21 2017 + address: 123 Fake street + city: Redmond + state: Washington + postal_code: 12345 + phone: (234) 837-2886 + +bad_customer1: + registered_at: August 11 2014 + address: 123 Fake street + city: Bellevue + state: Washington + postal_code: 12124 + phone: (234) 837-2886 + +bad_customer2: + name: natalia kuleniuk + registered_at: August 11 2014 + address: 123 Fake street + city: Bellevue + postal_code: 12124 + phone: (234) 837-2886 + +bad_customer3: + name: natalia kuleniuk + registered_at: August 11 2014 + address: 123 Fake street + city: Bellevue + state: Washington + postal_code: 12124 + +bad_customer4: + name: natalia kuleniuk + registered_at: August 11 2014 + city: Bellevue + state: Washington + postal_code: 12124 + phone: (234) 837-2886 + +customer_bad_city: + name: natalia kuleniuk + registered_at: May 21 2017 + address: 123 Fake street + city: 323223 + state: Washington + postal_code: 12345 + phone: (234) 837-2886 + +customer_bad_state: + name: natalia kuleniuk + registered_at: May 21 2017 + address: 123 Fake street + city: Redmond + state: 32232 + postal_code: 12345 + phone: (234) 837-2886 + +customer_bad_zip: + name: natalia kuleniuk + registered_at: May 21 2017 + address: 123 Fake street + city: Redmond + state: 32232 + postal_code: 1234543 + phone: (234) 837-2886 + +customer_bad_phone: + name: natalia kuleniuk + registered_at: May 21 2017 + address: 123 Fake street + city: Redmond + state: 32232 + postal_code: 1234543 + phone: (2344343-)837-2886 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..62fd73893 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,71 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + describe "Validation" do + before do + @input = { name: "Shelley Rocha", + registered_at: "Wed, 29 Apr 2015 07:54:14 -0700", + address: "Ap #292-5216 Ipsum Rd.", + city: "Hillsboro", + state: "OR", + postal_code: "24309", + phone: "(322) 510-8695", + } + end + it "Can be created with all attributes" do + customer = Customer.new(@input) + result = customer.valid? + result.must_equal true + end + it "Cannot be created without attributes" do + customer = Customer.new + result = customer.valid? + result.must_equal false + end + it "cannot be created with invalid city" do + @input[:city] = "CityWithNumbers12345" + customer = Customer.new(@input) + result = customer.valid? + result.must_equal false + end + it "cannot be created with invalid state" do + @input[:state] = "StateWithNumbers12345" + customer = Customer.new(@input) + result = customer.valid? + result.must_equal false + end + it "cannot be created if postal_code length != 5" do + @input[:postal_code] = 3232903 + customer = Customer.new(@input) + result = customer.valid? + result.must_equal false + end + it "cannot be created if postal_code is not contains all digits" do + @input[:postal_code] = "123la" + customer = Customer.new(@input) + result = customer.valid? + result.must_equal false + end + it "cannot be created if phone is not valid" do + @input[:phone] = "2332323232232" + customer = Customer.new(@input) + result = customer.valid? + result.must_equal false + end + it "Cannot be created even if one attributes is not presented" do + @input.keys.each do |key| + @input.delete(key) + customer = Customer.new(@input) + result = customer.valid? + result.must_equal false + end - it "must be valid" do - value(customer).must_be :valid? + end end + + + + + + end From 916e7a048004cd48cef2772688d09e8f3416cc91 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Tue, 9 May 2017 16:30:30 -0700 Subject: [PATCH 10/65] added tests for model Customer and customers controller --- app/models/customer.rb | 2 +- test/models/customer_test.rb | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 1d8da9475..d5b7ccc17 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -4,7 +4,7 @@ class Customer < ApplicationRecord validates :registered_at,presence: true - validates :address,presence: true + validates :address, presence: true, length: {minimum: 3} validates :city,presence: true, format: { with: /\A[a-zA-Z]+\z/ } diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 62fd73893..782247d3a 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -12,6 +12,15 @@ phone: "(322) 510-8695", } end + it "Cannot be created even if one attributes is not presented" do + @input.keys.each do |key| + @input.delete(key) + customer = Customer.new(@input) + result = customer.valid? + result.must_equal false + end + end + it "Can be created with all attributes" do customer = Customer.new(@input) result = customer.valid? @@ -22,6 +31,12 @@ result = customer.valid? result.must_equal false end + it "cannot be created with invalid address" do + @input[:address] = "on" + customer = Customer.new(@input) + result = customer.valid? + result.must_equal false + end it "cannot be created with invalid city" do @input[:city] = "CityWithNumbers12345" customer = Customer.new(@input) @@ -52,15 +67,8 @@ result = customer.valid? result.must_equal false end - it "Cannot be created even if one attributes is not presented" do - @input.keys.each do |key| - @input.delete(key) - customer = Customer.new(@input) - result = customer.valid? - result.must_equal false - end - end + end From 75599766bdc71456aa0dbe79a78ccfe99f814e21 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 9 May 2017 16:41:11 -0700 Subject: [PATCH 11/65] passing movie index tests --- app/controllers/movies_controller.rb | 8 +++++- test/controllers/movies_controller_test.rb | 30 +++++++++++++++++++++- test/models/movie_test.rb | 9 +++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b3dc2ef8d..693d54ed3 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,6 +1,12 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(only: [:title, :release_date]), status: :ok + + if movies.empty? + render json: { errors: "Something is wrong with the database"}, + status: :internal_server_error + else + render json: movies.as_json(only: [:title, :release_date]), status: :ok + end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 6933663cb..87cc99b77 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -3,6 +3,10 @@ describe MoviesController do describe 'Index' do + # before do + # @movies_count = Movie.count + # end + it 'is a real working api route' do get movies_path must_respond_with :success @@ -13,9 +17,33 @@ response.header['Content-Type'].must_include 'json' end - it 'returns an array' do + it 'returns an array of hashes' do get movies_path response.parsed_body.must_be_instance_of Array + response.parsed_body.each do |movie_hash| + movie_hash.must_be_instance_of Hash + end + end + + it 'returns the correct amount of movies' do + get movies_path + response.parsed_body.length.must_equal Movie.count + end + + it 'returns movies with the expected fields' do + keys = %w(release_date title) + get movies_path + response.parsed_body.each do |movie| + movie.keys.sort.must_equal keys + end + end + + # wait do we need this ... + it 'returns 500 if there are no movies in db' do + Movie.destroy_all + get movies_path + response.status.must_equal 500 + response.parsed_body.must_include "error" end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f8e8013d2..e2f625677 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -28,6 +28,15 @@ def create_movie(info) repeat.errors.must_include :title end + it 'wont create instance if any attrivbute is missing' do + @input.keys.each do |attribute| + @input.delete(attribute) + movie = Movie.new(@input) + movie.valid?.must_equal false + movie.errors.must_include key + end + end + it 'has to include an overview' do @input.delete(:overview) movie_no_overview = Movie.new(@input) From 362d3e0f1f0f679626c912b25ee12812ca736859 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 9 May 2017 16:43:21 -0700 Subject: [PATCH 12/65] dryed up model validations testing --- test/controllers/movies_controller_test.rb | 2 +- test/models/movie_test.rb | 23 +--------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 87cc99b77..733eece64 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -43,7 +43,7 @@ Movie.destroy_all get movies_path response.status.must_equal 500 - response.parsed_body.must_include "error" + response.parsed_body.must_include "errors" end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e2f625677..198495acd 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -33,31 +33,10 @@ def create_movie(info) @input.delete(attribute) movie = Movie.new(@input) movie.valid?.must_equal false - movie.errors.must_include key + movie.errors.must_include attribute end end - it 'has to include an overview' do - @input.delete(:overview) - movie_no_overview = Movie.new(@input) - movie_no_overview.valid?.must_equal false - movie_no_overview.errors.must_include :overview - end - - it 'has to include a release data' do - @input.delete(:release_date) - movie_no_date = Movie.new(@input) - movie_no_date.valid?.must_equal false - movie_no_date.errors.must_include :release_date - end - - it 'has to include inventory integer' do - @input.delete(:inventory) - movie_no_inv = Movie.new(@input) - movie_no_inv.valid?.must_equal false - movie_no_inv.errors.must_include :inventory - end - it "can't include a negative inventory" do @input[:inventory] = -3 movie = create_movie(@input) From 96245c52de0175ea28251cbdbc187d56c8ae4147 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Tue, 9 May 2017 16:45:37 -0700 Subject: [PATCH 13/65] added test for validation --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 8 +++++++- test/models/customer_test.rb | 15 ++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c7a20d8ed..5bc7c4470 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,7 +3,7 @@ class CustomersController < ApplicationController def index customers = Customer.all if customers.empty? - render status: :not_found, json: { errors: "Cannot find customers" } + render status: :internal_server_error, json: { errors: "Something went horribly wrong with our database. Sorry for inconvenience" } else render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 98d4ea2f1..838f5403c 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,6 +7,13 @@ must_respond_with :success end + it " response with internal_server_error if there are no customers in database" do + Customer.destroy_all + get customers_path + must_respond_with :internal_server_error + response.parsed_body.must_include "errors" + end + it "returns json" do get customers_path response.header['Content-Type'].must_include 'json' @@ -14,7 +21,6 @@ it "returns an Array class object" do get customers_path - body = JSON.parse(response.body) body.must_be_kind_of Array end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 782247d3a..8abe154a1 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -18,6 +18,7 @@ customer = Customer.new(@input) result = customer.valid? result.must_equal false + customer.errors.must_include key end end @@ -49,12 +50,18 @@ result = customer.valid? result.must_equal false end - it "cannot be created if postal_code length != 5" do + it "cannot be created if postal_code length > 5" do @input[:postal_code] = 3232903 customer = Customer.new(@input) result = customer.valid? result.must_equal false end + it "cannot be created if postal_code length < 5" do + @input[:postal_code] = 903 + customer = Customer.new(@input) + result = customer.valid? + result.must_equal false + end it "cannot be created if postal_code is not contains all digits" do @input[:postal_code] = "123la" customer = Customer.new(@input) @@ -67,13 +74,7 @@ result = customer.valid? result.must_equal false end - - end - - - - end From 44b83daca6597576d7d31c28271705ec04955116 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Tue, 9 May 2017 16:49:24 -0700 Subject: [PATCH 14/65] added movie show request --- app/controllers/movies_controller.rb | 7 ++++++- config/routes.rb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 693d54ed3..61deee499 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,10 +3,15 @@ def index movies = Movie.all if movies.empty? - render json: { errors: "Something is wrong with the database"}, + render json: { errors: "Something is wrong with the database" }, status: :internal_server_error else render json: movies.as_json(only: [:title, :release_date]), status: :ok end end + + def show + movie = Movie.find_by( title: params[:title] ) + render json: movie.as_json(only: [ :title, :overview, :release_date, :inventory, :available_inventory ]), status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index b6f3f63a1..068d569d1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get 'movies', to: 'movies#index', as: 'movies' - get 'movies/:id', to: 'movies#show', as: 'movie' + get 'movies/:title', to: 'movies#show', as: 'movie' end From c638a5fbad84abec7b27f26dfae1db6cf6c733ba Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Tue, 9 May 2017 18:23:16 -0700 Subject: [PATCH 15/65] added 2 tests for show movie method --- app/controllers/movies_controller.rb | 11 ++++++++--- test/controllers/movies_controller_test.rb | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 61deee499..8b1c52532 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -4,14 +4,19 @@ def index if movies.empty? render json: { errors: "Something is wrong with the database" }, - status: :internal_server_error + status: :internal_server_error else render json: movies.as_json(only: [:title, :release_date]), status: :ok end end def show - movie = Movie.find_by( title: params[:title] ) - render json: movie.as_json(only: [ :title, :overview, :release_date, :inventory, :available_inventory ]), status: :ok + movie = Movie.find_by( title: params[:title]) + if movie == nil + render status: :not_found, json: { errors: "Cannot find a movie with title #{params[:title]}" } + else + render json: movie.as_json(only: [ :title, :overview, :release_date, :inventory, :available_inventory ]), status: :ok + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 733eece64..dd3cb9301 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -46,4 +46,22 @@ response.parsed_body.must_include "errors" end end + + describe "show" do + it "can get a movie" do + get movie_path(movies(:two).title) + must_respond_with :success + end + it "respond with 404 error if cannot get a movie that doesnt exist" do + title = "Title that DNE" + get movie_path(title) + must_respond_with :not_found + body = JSON.parse(response.body) + + error_hash = {"errors" => "Cannot find a movie with title #{title}"} + body.must_equal error_hash + end + end + + end From 98661845a57339628609d375f003b1b00fc9c4ea Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 09:04:31 -0700 Subject: [PATCH 16/65] fixed test for movies cotnroller --- app/controllers/movies_controller.rb | 4 +++- test/controllers/movies_controller_test.rb | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 8b1c52532..2d81f7834 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -13,7 +13,9 @@ def index def show movie = Movie.find_by( title: params[:title]) if movie == nil - render status: :not_found, json: { errors: "Cannot find a movie with title #{params[:title]}" } + render status: :not_found, json:{ + "errors": { "title": ["Movie #{params[:title]} not found"] } + } else render json: movie.as_json(only: [ :title, :overview, :release_date, :inventory, :available_inventory ]), status: :ok end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index dd3cb9301..e8783fe6a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -57,8 +57,9 @@ get movie_path(title) must_respond_with :not_found body = JSON.parse(response.body) - - error_hash = {"errors" => "Cannot find a movie with title #{title}"} + error_hash = { + "errors" => { "title"=> ["Movie #{title} not found"] } + } body.must_equal error_hash end end From c99020eeb4ac3d07ba274f9f0ac431b79afd8a3b Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 09:23:47 -0700 Subject: [PATCH 17/65] added serializer for customers --- Gemfile | 2 +- Gemfile.lock | 9 +++++++++ app/controllers/customers_controller.rb | 4 ++-- app/serializers/customer_serializer.rb | 3 +++ 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 app/serializers/customer_serializer.rb diff --git a/Gemfile b/Gemfile index 731adf181..21bfaf93f 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end - +gem 'active_model_serializers', '~> 0.10.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.0.2' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 0f180409d..a220688de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,6 +24,11 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) + active_model_serializers (0.10.6) + actionpack (>= 4.1, < 6) + activemodel (>= 4.1, < 6) + case_transform (>= 0.2) + jsonapi-renderer (>= 0.1.1.beta1, < 0.2) activejob (5.0.2) activesupport (= 5.0.2) globalid (>= 0.3.6) @@ -51,6 +56,8 @@ GEM rack (>= 0.9.0) builder (3.2.3) byebug (9.0.6) + case_transform (0.2) + activesupport coderay (1.1.1) concurrent-ruby (1.0.5) erubis (2.7.0) @@ -66,6 +73,7 @@ GEM jbuilder (2.6.3) activesupport (>= 3.0.0, < 5.2) multi_json (~> 1.2) + jsonapi-renderer (0.1.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -160,6 +168,7 @@ PLATFORMS ruby DEPENDENCIES + active_model_serializers (~> 0.10.0) awesome_print better_errors byebug diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5bc7c4470..b713f7f4f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,7 +5,7 @@ def index if customers.empty? render status: :internal_server_error, json: { errors: "Something went horribly wrong with our database. Sorry for inconvenience" } else - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + render json: customers, status: :ok end end @@ -14,7 +14,7 @@ def show if customer == nil render status: :not_found, json: { errors: "Cannot find a customer with id #{params[:id]}" } else - render json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + render json: customer, status: :ok end end diff --git a/app/serializers/customer_serializer.rb b/app/serializers/customer_serializer.rb new file mode 100644 index 000000000..902e6fea9 --- /dev/null +++ b/app/serializers/customer_serializer.rb @@ -0,0 +1,3 @@ +class CustomerSerializer < ActiveModel::Serializer + attributes :id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count +end From 4680f837a3d8b978cb8b563604109fd276090c24 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 09:38:24 -0700 Subject: [PATCH 18/65] finished with test --- app/controllers/customers_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index b713f7f4f..5706e707b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -12,7 +12,9 @@ def index def show customer = Customer.find_by(id: params[:id]) if customer == nil - render status: :not_found, json: { errors: "Cannot find a customer with id #{params[:id]}" } + render status: :not_found, json: { + "errors": { "id": ["Customer #{params[:id]} not found"]} + } else render json: customer, status: :ok end From d3c8ecaa8a28a82f9b971dee01e5973b01cc7a33 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 10:08:49 -0700 Subject: [PATCH 19/65] fixed test for movies show method --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2d81f7834..348c434f7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,7 +14,7 @@ def show movie = Movie.find_by( title: params[:title]) if movie == nil render status: :not_found, json:{ - "errors": { "title": ["Movie #{params[:title]} not found"] } + "404 error": { "title": ["Movie #{params[:title]} not found"] } } else render json: movie.as_json(only: [ :title, :overview, :release_date, :inventory, :available_inventory ]), status: :ok diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e8783fe6a..f242d6cfc 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -57,10 +57,7 @@ get movie_path(title) must_respond_with :not_found body = JSON.parse(response.body) - error_hash = { - "errors" => { "title"=> ["Movie #{title} not found"] } - } - body.must_equal error_hash + body.must_include "404 error" end end From 0152a5e67e9f2d63181bd99a26d0de5eea454dbb Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 10:18:27 -0700 Subject: [PATCH 20/65] fixed typo in table column --- db/migrate/20170509212649_create_movies.rb | 2 +- db/schema.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db/migrate/20170509212649_create_movies.rb b/db/migrate/20170509212649_create_movies.rb index 4596922dc..d2f5f49a0 100644 --- a/db/migrate/20170509212649_create_movies.rb +++ b/db/migrate/20170509212649_create_movies.rb @@ -5,7 +5,7 @@ def change t.string :overview t.string :release_date t.integer :inventory - t.integer :available_invetory, default: 0 + t.integer :available_inventory, default: 0 t.timestamps end end diff --git a/db/schema.rb b/db/schema.rb index 0bc7a737c..c37570c63 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -33,9 +33,9 @@ t.string "overview" t.string "release_date" t.integer "inventory" - t.integer "available_invetory", default: 0 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "available_inventory", default: 0 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end end From 6c2fdd6e68fa12880fb22bfe3c220425436382de Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Wed, 10 May 2017 10:38:16 -0700 Subject: [PATCH 21/65] added serializer for movies controller --- app/controllers/movies_controller.rb | 5 ++--- app/models/movie.rb | 2 +- app/serializers/movie_list_serializer.rb | 3 +++ app/serializers/movie_serializer.rb | 3 +++ 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 app/serializers/movie_list_serializer.rb create mode 100644 app/serializers/movie_serializer.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 348c434f7..eeeb90ed6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -6,7 +6,7 @@ def index render json: { errors: "Something is wrong with the database" }, status: :internal_server_error else - render json: movies.as_json(only: [:title, :release_date]), status: :ok + render json: movies, each_serializer: MovieListSerializer, status: :ok end end @@ -17,8 +17,7 @@ def show "404 error": { "title": ["Movie #{params[:title]} not found"] } } else - render json: movie.as_json(only: [ :title, :overview, :release_date, :inventory, :available_inventory ]), status: :ok + render json: movie, status: :ok end - end end diff --git a/app/models/movie.rb b/app/models/movie.rb index b0f97568e..061c5b3a9 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,5 +3,5 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { greater_than: -1 } - validates :available_invetory, presence: true, numericality: { greater_than: -1 } + validates :available_inventory, presence: true, numericality: { greater_than: -1 } end diff --git a/app/serializers/movie_list_serializer.rb b/app/serializers/movie_list_serializer.rb new file mode 100644 index 000000000..e142b54f2 --- /dev/null +++ b/app/serializers/movie_list_serializer.rb @@ -0,0 +1,3 @@ +class MovieListSerializer < ActiveModel::Serializer + attributes :title, :release_date +end diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb new file mode 100644 index 000000000..8ecd37d50 --- /dev/null +++ b/app/serializers/movie_serializer.rb @@ -0,0 +1,3 @@ +class MovieSerializer < ActiveModel::Serializer + attributes :title, :overview, :release_date, :inventory, :available_inventory +end From 8915dbca7ec925f98f1c90f5acc1b7c85889c98b Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 10:38:40 -0700 Subject: [PATCH 22/65] typo in movie --- app/models/movie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index b0f97568e..061c5b3a9 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,5 +3,5 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { greater_than: -1 } - validates :available_invetory, presence: true, numericality: { greater_than: -1 } + validates :available_inventory, presence: true, numericality: { greater_than: -1 } end From 23a7338afb95eeade6ca191c86af9796b591b888 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Wed, 10 May 2017 10:54:34 -0700 Subject: [PATCH 23/65] created rentals table and relationships between models --- app/controllers/movies_controller.rb | 2 +- app/models/customer.rb | 3 ++- app/models/movie.rb | 1 + app/models/rental.rb | 2 ++ db/migrate/20170510174106_create_rentals.rb | 13 +++++++++++++ db/schema.rb | 15 ++++++++++++++- test/fixtures/rentals.yml | 11 +++++++++++ test/models/rental_test.rb | 9 +++++++++ 8 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20170510174106_create_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index eeeb90ed6..66f1700c6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,7 +15,7 @@ def show if movie == nil render status: :not_found, json:{ "404 error": { "title": ["Movie #{params[:title]} not found"] } - } + } else render json: movie, status: :ok end diff --git a/app/models/customer.rb b/app/models/customer.rb index d5b7ccc17..d607a80de 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,6 @@ class Customer < ApplicationRecord - + has_many :rentals + validates :name, presence: true validates :registered_at,presence: true diff --git a/app/models/movie.rb b/app/models/movie.rb index 061c5b3a9..8e49175e0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,5 @@ class Movie < ApplicationRecord + has_many :rentals validates :title, presence: true, uniqueness: true validates :overview, presence: true validates :release_date, presence: true 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/20170510174106_create_rentals.rb b/db/migrate/20170510174106_create_rentals.rb new file mode 100644 index 000000000..b48ef352b --- /dev/null +++ b/db/migrate/20170510174106_create_rentals.rb @@ -0,0 +1,13 @@ +class CreateRentals < ActiveRecord::Migration[5.0] + def change + create_table :rentals do |t| + t.belongs_to :movie + t.belongs_to :customer + t.date :check_out_date + t.date :return_date + t.date :due_date + t.string :status + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index c37570c63..d071d8d4b 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: 20170509212649) do +ActiveRecord::Schema.define(version: 20170510174106) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,4 +38,17 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.integer "movie_id" + t.integer "customer_id" + t.date "check_out_date" + t.date "return_date" + t.date "due_date" + t.string "status" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree + t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree + end + end 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/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 655a03ce3b2493baba2cf03a57341fa5f722d708 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Wed, 10 May 2017 11:01:06 -0700 Subject: [PATCH 24/65] added rental validations --- app/models/rental.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..5c2b8f98d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,6 @@ class Rental < ApplicationRecord + validates :check_out_date, presence: true + validates :return_date, presence: true + validates :due_date, presence: true + validates :status , presence: true, inclusion: { in: [ "checked out", "checked in", "overdue"] } end From b488bb91b1741159b9dcff32cafdd66c3eb7bcc6 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Wed, 10 May 2017 11:29:05 -0700 Subject: [PATCH 25/65] success test for rental validations --- app/models/rental.rb | 2 +- test/fixtures/customers.yml | 7 +------ test/models/rental_test.rb | 21 ++++++++++++++++++--- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 5c2b8f98d..ccba1f54f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,6 @@ class Rental < ApplicationRecord validates :check_out_date, presence: true - validates :return_date, presence: true + # validates :return_date, presence: true validates :due_date, presence: true validates :status , presence: true, inclusion: { in: [ "checked out", "checked in", "overdue"] } end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index b5acb710b..aa8ae6a10 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,11 +4,6 @@ # 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 good_customer: name: natalia kuleniuk @@ -85,4 +80,4 @@ customer_bad_phone: city: Redmond state: 32232 postal_code: 1234543 - phone: (2344343-)837-2886 + phone: (2344343-)837-2886 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..c4fb4c9eb 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,24 @@ require "test_helper" +require 'date' describe Rental do - let(:rental) { Rental.new } - it "must be valid" do - value(rental).must_be :valid? + before do + @checkout + end + + let(:movie) { movies(:one) } + let(:customer) { customers(:good_customer) } + + it "requires all attributes" do + rental = Rental.new + rental.movie_id = movie.id + rental.customer_id = customer.id + rental.check_out_date = Date.today + rental.due_date = Date.today + 3 + rental.status = "checked out" + rental.valid?.must_equal true + rental.save + Rental.find_by(customer_id: customer.id).wont_be_nil end end From fb947e733ed3149eabc98cc78960975bf8ea530d Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Wed, 10 May 2017 12:01:43 -0700 Subject: [PATCH 26/65] test for missing rental validations --- app/models/rental.rb | 2 ++ test/models/movie_test.rb | 5 +++-- test/models/rental_test.rb | 36 ++++++++++++++++++++++++------------ 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index ccba1f54f..245b466bd 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,6 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer validates :check_out_date, presence: true # validates :return_date, presence: true validates :due_date, presence: true diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 198495acd..b6ade3989 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -30,8 +30,9 @@ def create_movie(info) it 'wont create instance if any attrivbute is missing' do @input.keys.each do |attribute| - @input.delete(attribute) - movie = Movie.new(@input) + input = @input.dup + input.delete(attribute) + movie = Movie.new(input) movie.valid?.must_equal false movie.errors.must_include attribute end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index c4fb4c9eb..512c2dd07 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -4,21 +4,33 @@ describe Rental do before do - @checkout - end + @customer_id = customers(:good_customer).id + @rental_info = { + movie_id: movies(:one).id, + customer_id: @customer_id, + check_out_date: Date.today, + due_date: Date.today + 3, + status: "checked out" + } + - let(:movie) { movies(:one) } - let(:customer) { customers(:good_customer) } + end - it "requires all attributes" do - rental = Rental.new - rental.movie_id = movie.id - rental.customer_id = customer.id - rental.check_out_date = Date.today - rental.due_date = Date.today + 3 - rental.status = "checked out" + it "requires all attributes to create instance" do + rental = Rental.new(@rental_info) rental.valid?.must_equal true rental.save - Rental.find_by(customer_id: customer.id).wont_be_nil + Rental.find_by(customer_id: @customer_id ).wont_be_nil + end + + it "wont create a rental if missing an needed attribute" do + # rental = @rental_info.dup + @rental_info.keys.each do |attribute| + rental_info = @rental_info.dup + rental_info.delete(attribute) + rental = Rental.new(rental_info) + rental.valid?.must_equal false + rental.errors.wont_be_nil + end end end From e4b19a1d9a6f5e92601691d3fc0ca62fc7be6790 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 12:03:04 -0700 Subject: [PATCH 27/65] added create method for rentals --- app/controllers/rentals_controller.rb | 51 +++++++++++++++++++++ app/models/rental.rb | 4 +- config/routes.rb | 3 ++ test/controllers/rentals_controller_test.rb | 7 +++ 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..e092a7599 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,51 @@ +require 'date' + +class RentalsController < ApplicationController + + def create + rental = Rental.new + movie = Movie.find_by(title: params[:title]) + rental.movie_id = movie.id + rental.check_out_date = Date.today + # rental.return_date = nil + rental.due_date = check_out_date + 3 + rental.status = "checked out" + + rental.customer_id = params[:customer_id] + customer = Customer.find(params[:customer_id]) + + customer.movies_checked_out_count += 1 + # movie.available_inventory = inventory - 1 # ?????????? + if rental.save + render status: :ok, json: { id: rental.id } + else + render status: :bad_request, json: { errors: rental.errors.messages } + end + end + + def update + rental = Rental.find_by(title: params[:title], customer_id: params[:customer_id]) + rental.return_date = Date.today + + rental.customer.movies_checked_out_count += 1 + rental.movie.available_inventory += 1 # ?????????? + rental.status = "checked in" + + if rental.save + render status: :ok, json: { id: rental.status } + else + render status: :bad_request, json: { errors: rental.errors.messages } + end + end + + + + + + + private + def rental_params + params.require(:rental).permit(:customer_id, :title, :check_out_date, + :return_date, :due_date, :status) + end +end diff --git a/app/models/rental.rb b/app/models/rental.rb index 5c2b8f98d..245b466bd 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,8 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer validates :check_out_date, presence: true - validates :return_date, presence: true + # validates :return_date, presence: true validates :due_date, presence: true validates :status , presence: true, inclusion: { in: [ "checked out", "checked in", "overdue"] } end diff --git a/config/routes.rb b/config/routes.rb index b4e0c2c49..f0a9da6d0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,4 +7,7 @@ get 'movies', to: 'movies#index', as: 'movies' get 'movies/:title', to: 'movies#show', as: 'movie' + + post "/rentals/:title/check-out", to: "rentals#create" + patch "/rentals/:title/check-in", to: "rentals#update" 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 b7ab645608927a652604bcdf1891479c5694eaf5 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Wed, 10 May 2017 15:05:40 -0700 Subject: [PATCH 28/65] have rental checkout method working --- app/controllers/rentals_controller.rb | 38 ++++++++++++--------------- app/models/rental.rb | 16 +++++++++++ 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e092a7599..1e71ba7d5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,25 +1,26 @@ -require 'date' +# require 'date' class RentalsController < ApplicationController def create - rental = Rental.new - movie = Movie.find_by(title: params[:title]) - rental.movie_id = movie.id - rental.check_out_date = Date.today - # rental.return_date = nil - rental.due_date = check_out_date + 3 - rental.status = "checked out" - - rental.customer_id = params[:customer_id] - customer = Customer.find(params[:customer_id]) + # example of params + # {"rental"=>{ "customer_id"=>1 }, "title"=>"Psycho"} - customer.movies_checked_out_count += 1 - # movie.available_inventory = inventory - 1 # ?????????? - if rental.save - render status: :ok, json: { id: rental.id } + movie = Movie.find_by(title: params[:title]) + if movie + rental_info = { + customer_id: params["rental"]["customer_id"], + movie_id: movie.id + } + rental = Rental.create_rental(rental_info) + if rental.save + render status: :ok, json: { id: rental.id } + else + render status: :bad_request, json: { errors: rental.errors.messages } + end else - render status: :bad_request, json: { errors: rental.errors.messages } + # should we add a check if customer also DNE + render status: :bad_request, json: { error: "movie does not exist" } end end @@ -38,11 +39,6 @@ def update end end - - - - - private def rental_params params.require(:rental).permit(:customer_id, :title, :check_out_date, diff --git a/app/models/rental.rb b/app/models/rental.rb index 245b466bd..34ea26d41 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,3 +1,4 @@ +require 'date' class Rental < ApplicationRecord belongs_to :movie belongs_to :customer @@ -5,4 +6,19 @@ class Rental < ApplicationRecord # validates :return_date, presence: true validates :due_date, presence: true validates :status , presence: true, inclusion: { in: [ "checked out", "checked in", "overdue"] } + +# {"rental"=>{"customer_id"=>1, "date"=>"2017-05-10"}, "title"=>"Psycho"} + # {customer_id => 1, movie_id => #} + def self.create_rental(info) + rental = Rental.new + # find_movie ? bad design to call Movie.find_by in Rental class + # movie = Movie.find_by(title: info["title"]) + rental.movie_id = info[:movie_id] + rental.customer_id = info[:customer_id] + rental.check_out_date = Date.today + rental.due_date = Date.today + 3 + rental.status = "checked out" + return rental + end + end From b23796e94eda2a575d17e4acbcab34f18a2ab1c1 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 15:07:37 -0700 Subject: [PATCH 29/65] create method for rentals --- app/controllers/rentals_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e092a7599..3f0f7ff04 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,6 +2,9 @@ class RentalsController < ApplicationController + def index + rentals = Rental.all + end def create rental = Rental.new movie = Movie.find_by(title: params[:title]) From aecc0613853fcd1481bb41be16ecc9e75cba1323 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 15:26:54 -0700 Subject: [PATCH 30/65] added get overdue ,ethod to Movie controller --- app/models/rental.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 34ea26d41..6fbdb9f2a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -21,4 +21,21 @@ def self.create_rental(info) return rental end + + def self.get_overdue + array_of_overdue = [] + Rental.all.each do |rental| + if #due_date before today + rental.status = "overdue" + rental.save + array_of_overdue << rental + end + end + return array_of_overdue + end + + + + + end From 95c663204b4dc5503b5d7819bf48d9ff00b03cbb Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 15:45:04 -0700 Subject: [PATCH 31/65] get overdue movies method works --- app/controllers/rentals_controller.rb | 10 +++++++--- app/models/rental.rb | 2 +- config/routes.rb | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3632d61d1..abcbbf2b4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,9 +2,7 @@ class RentalsController < ApplicationController - def index - rentals = Rental.all - end + def create # example of params # {"rental"=>{ "customer_id"=>1 }, "title"=>"Psycho"} @@ -42,6 +40,12 @@ def update end end + + def get_overdue + overdue_rentals = Rental.overdue_movies + render status: :ok, json: overdue_rentals + end + private def rental_params params.require(:rental).permit(:customer_id, :title, :check_out_date, diff --git a/app/models/rental.rb b/app/models/rental.rb index 6fbdb9f2a..4495d12f2 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -25,7 +25,7 @@ def self.create_rental(info) def self.get_overdue array_of_overdue = [] Rental.all.each do |rental| - if #due_date before today + if rental.due_date < Date.today rental.status = "overdue" rental.save array_of_overdue << rental diff --git a/config/routes.rb b/config/routes.rb index f0a9da6d0..d1a41d376 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,4 +10,6 @@ post "/rentals/:title/check-out", to: "rentals#create" patch "/rentals/:title/check-in", to: "rentals#update" + + get "/rentals/overdue", to: "rentals#get_overdue" end From 6384a239522dace411ba6e2dd1e43b4dcbd32d8c Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Wed, 10 May 2017 15:47:01 -0700 Subject: [PATCH 32/65] success test for rental create --- config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 18 +++++++++++++++--- test/fixtures/movies.yml | 6 +++--- test/fixtures/rentals.yml | 18 +++++++++++++----- test/models/rental_test.rb | 2 +- 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index f0a9da6d0..d90650ea7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,6 @@ get 'movies/:title', to: 'movies#show', as: 'movie' - post "/rentals/:title/check-out", to: "rentals#create" + post "/rentals/:title/check-out", to: "rentals#create", as: 'rental' patch "/rentals/:title/check-in", to: "rentals#update" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f242d6cfc..394e37dbe 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -49,7 +49,7 @@ describe "show" do it "can get a movie" do - get movie_path(movies(:two).title) + get movie_path(movies(:movie2).title) must_respond_with :success end it "respond with 404 error if cannot get a movie that doesnt exist" do diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..e70345294 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,19 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe 'create' do + + before do + @customer = customers(:good_customer) + @movie = movies(:movie1) + end + + let(:rental_data) { { customer_id: @customer.id } } + + it 'creates a new rental' do + post rental_path(@movie.title), params: { rental: rental_data } + must_respond_with :success + end + + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index c5065ae03..7d969a18c 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,19 +4,19 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: +movie1: title: Psycho overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. release_date: 1960-06-16 inventory: 8 -two: +movie2: title: Psycho overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. release_date: 1960-06-16 inventory: 8 -three: +movie3: title: Jaws overview: An insatiable great white shark terrorizes the townspeople of Amity Island, The police chief, an oceanographer and a grizzled shark hunter seek to destroy the bloodthirsty beast. release_date: 1975-06-19 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..92b63cd3c 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,16 @@ # 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 +rental1: + customer_id: good_customer + movie_id: movie1 + check_out_date: 2017-05-08 + due_date: 2017-05-11 + status: checked out + +rental2: + customer_id: + movie_id: movie2 + check_out_date: 2017-05-07 + due_date: 2017-05-10 + status: checked out diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 512c2dd07..75d6c1036 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -6,7 +6,7 @@ before do @customer_id = customers(:good_customer).id @rental_info = { - movie_id: movies(:one).id, + movie_id: movies(:movie1).id, customer_id: @customer_id, check_out_date: Date.today, due_date: Date.today + 3, From 5e3812fd11369bcb00d539d0df830f0b84fc6de9 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Wed, 10 May 2017 15:48:53 -0700 Subject: [PATCH 33/65] added to rentals create success test --- test/controllers/rentals_controller_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e70345294..2c0620552 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -13,7 +13,11 @@ it 'creates a new rental' do post rental_path(@movie.title), params: { rental: rental_data } must_respond_with :success + response.parsed_body.must_include "id" + Rental.find(response.parsed_body["id"]).movie_id.must_equal @movie.id + Rental.find(response.parsed_body["id"]).customer_id.must_equal @customer.id end + end end From feac1e340611817934450435dad371582e9ab852 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Wed, 10 May 2017 15:54:58 -0700 Subject: [PATCH 34/65] added failure case for rental create - bad customer id --- app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1e71ba7d5..129fddd2b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -20,7 +20,7 @@ def create end else # should we add a check if customer also DNE - render status: :bad_request, json: { error: "movie does not exist" } + render status: :bad_request, json: { errors: "movie does not exist" } end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 2c0620552..368aa3f8d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,6 +4,7 @@ describe 'create' do before do + @bad_customer_id = Customer.all.last.id + 1 @customer = customers(:good_customer) @movie = movies(:movie1) end @@ -18,6 +19,16 @@ Rental.find(response.parsed_body["id"]).customer_id.must_equal @customer.id end + it 'returns bad request if given customer id DNE' do + post rental_path(@movie.title), params: { rental: { customer_id: @bad_customer_id } } + must_respond_with :bad_request + response.parsed_body.must_include "errors" + end + + # it 'returns bad request if given movie title DNE' do + + # end + end end From e8d086e34d5a2800f1fb9573d12f65ef5988516c Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 19:38:55 -0700 Subject: [PATCH 35/65] made serializer for overdue works --- app/controllers/rentals_controller.rb | 6 ++++-- app/models/rental.rb | 14 +++++++------- app/serializers/overdue_list_serializer.rb | 17 +++++++++++++++++ config/routes.rb | 2 +- 4 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 app/serializers/overdue_list_serializer.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index abcbbf2b4..f32fadf45 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -41,9 +41,11 @@ def update end - def get_overdue + def overdue_rentals overdue_rentals = Rental.overdue_movies - render status: :ok, json: overdue_rentals + + render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok + end private diff --git a/app/models/rental.rb b/app/models/rental.rb index 4495d12f2..9544d3068 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,8 +7,8 @@ class Rental < ApplicationRecord validates :due_date, presence: true validates :status , presence: true, inclusion: { in: [ "checked out", "checked in", "overdue"] } -# {"rental"=>{"customer_id"=>1, "date"=>"2017-05-10"}, "title"=>"Psycho"} - # {customer_id => 1, movie_id => #} + # {"rental"=>{"customer_id"=>1, "date"=>"2017-05-10"}, "title"=>"Psycho"} + # {customer_id => 1, movie_id => #} def self.create_rental(info) rental = Rental.new # find_movie ? bad design to call Movie.find_by in Rental class @@ -22,16 +22,16 @@ def self.create_rental(info) end - def self.get_overdue - array_of_overdue = [] + def self.overdue_movies + array_of_overdues = [] Rental.all.each do |rental| if rental.due_date < Date.today rental.status = "overdue" rental.save - array_of_overdue << rental + array_of_overdues << rental + end end - end - return array_of_overdue + return array_of_overdues end diff --git a/app/serializers/overdue_list_serializer.rb b/app/serializers/overdue_list_serializer.rb new file mode 100644 index 000000000..5e67cd764 --- /dev/null +++ b/app/serializers/overdue_list_serializer.rb @@ -0,0 +1,17 @@ +class OverdueListSerializer < ActiveModel::Serializer + attributes :customer_id, :due_date, :check_out_date, + :title, :name, :postal_code + + def title + object.movie.title + end + + def name + object.customer.name + end + + def postal_code + object.customer.postal_code + end + +end diff --git a/config/routes.rb b/config/routes.rb index d1a41d376..501638261 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,5 +11,5 @@ post "/rentals/:title/check-out", to: "rentals#create" patch "/rentals/:title/check-in", to: "rentals#update" - get "/rentals/overdue", to: "rentals#get_overdue" + get "/rentals/overdue", to: "rentals#overdue_rentals" end From d1a8c5c9c5225e9b12cc6f8a5413acb6d550ff53 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Wed, 10 May 2017 19:46:17 -0700 Subject: [PATCH 36/65] add fail case for rental create given movie DNE --- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 17 +++++++++-------- test/controllers/rentals_controller_test.rb | 10 +++++----- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 838f5403c..cd84f748b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,7 +7,7 @@ must_respond_with :success end - it " response with internal_server_error if there are no customers in database" do + it "returns internal_server_error if there are no customers in db" do Customer.destroy_all get customers_path must_respond_with :internal_server_error diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 394e37dbe..964dc4985 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -3,10 +3,6 @@ describe MoviesController do describe 'Index' do - # before do - # @movies_count = Movie.count - # end - it 'is a real working api route' do get movies_path must_respond_with :success @@ -38,7 +34,6 @@ end end - # wait do we need this ... it 'returns 500 if there are no movies in db' do Movie.destroy_all get movies_path @@ -48,11 +43,19 @@ end describe "show" do + it "can get a movie" do get movie_path(movies(:movie2).title) must_respond_with :success + response.parsed_body["title"].must_include "Psycho" end - it "respond with 404 error if cannot get a movie that doesnt exist" do + + it 'returns json' do + get movie_path(movies(:movie1).title) + response.header['Content-Type'].must_include 'json' + end + + it "respond with 404 error if given movie id that doesnt exist" do title = "Title that DNE" get movie_path(title) must_respond_with :not_found @@ -60,6 +63,4 @@ body.must_include "404 error" end end - - end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 368aa3f8d..2006f89fa 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -25,10 +25,10 @@ response.parsed_body.must_include "errors" end - # it 'returns bad request if given movie title DNE' do - - # end - - + it 'returns bad request if given movie title DNE' do + post rental_path("Harry Potter"), params: { rental: rental_data } + must_respond_with :bad_request + response.parsed_body.must_include "errors" + end end end From 2d432a1cc5752a3550c773415a64dae39b6449c1 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 19:54:25 -0700 Subject: [PATCH 37/65] added update method for rentals --- app/controllers/rentals_controller.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f32fadf45..484d572f1 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,7 +6,6 @@ class RentalsController < ApplicationController def create # example of params # {"rental"=>{ "customer_id"=>1 }, "title"=>"Psycho"} - movie = Movie.find_by(title: params[:title]) if movie rental_info = { @@ -26,15 +25,15 @@ def create end def update - rental = Rental.find_by(title: params[:title], customer_id: params[:customer_id]) + movie = Movie.find_by(title: params[:title]) + rental = Rental.find_by(movie_id: movie.id, customer_id: params["rental"]["customer_id"]) rental.return_date = Date.today - - rental.customer.movies_checked_out_count += 1 - rental.movie.available_inventory += 1 # ?????????? rental.status = "checked in" + # rental.customer.movies_checked_out_count += 1 + # rental.movie.available_inventory += 1 # ?????????? if rental.save - render status: :ok, json: { id: rental.status } + render status: :ok, json: { status: rental.status } else render status: :bad_request, json: { errors: rental.errors.messages } end @@ -43,9 +42,7 @@ def update def overdue_rentals overdue_rentals = Rental.overdue_movies - render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok - end private From 760f1fde6e8fabed65a35a73f9c6599df1b4cd35 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 20:13:39 -0700 Subject: [PATCH 38/65] tests for Rental model overdue_movies method --- app/models/rental.rb | 4 +--- test/models/rental_test.rb | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 9544d3068..2c44e4d53 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -25,6 +25,7 @@ def self.create_rental(info) def self.overdue_movies array_of_overdues = [] Rental.all.each do |rental| + next if rental.due_date == nil if rental.due_date < Date.today rental.status = "overdue" rental.save @@ -35,7 +36,4 @@ def self.overdue_movies end - - - end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 512c2dd07..cc7d110cf 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -33,4 +33,34 @@ rental.errors.wont_be_nil end end + + + + + describe "self.overdue_movies" do + it "returns instance of Array" do + rental1 = Rental.new(@rental_info) + rental1.save + rental2 = Rental.new(@rental_info) + rental2.save + Rental.overdue_movies.must_be_kind_of Array + end + it "returns rentals with status overdue" do + Rental.overdue_movies.each do |movie| + movie.status.must_equal "overdue" + end + end + it "returns empty array if no overdue rentals was found" do + Rental.destroy_all + Rental.overdue_movies.must_be_empty + end + it "returns rentals which due_date is before today" do + Rental.overdue_movies.each do |movie| + movie.due_date.must_be :<, Date.today + end + end + + + + end end From c5b977c650ba7172f3ac118604ca66f81e349d31 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Wed, 10 May 2017 20:48:39 -0700 Subject: [PATCH 39/65] added tests for controller overdue rentals method --- app/controllers/rentals_controller.rb | 7 +- config/routes.rb | 6 +- test/controllers/rentals_controller_test.rb | 79 ++++++++++++++++++++- 3 files changed, 85 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 484d572f1..36a4f084e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -27,6 +27,7 @@ def create def update movie = Movie.find_by(title: params[:title]) rental = Rental.find_by(movie_id: movie.id, customer_id: params["rental"]["customer_id"]) + rental.return_date = Date.today rental.status = "checked in" @@ -42,7 +43,11 @@ def update def overdue_rentals overdue_rentals = Rental.overdue_movies - render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok + # if overdue_rentals.empty? + # render status: :no_content, json:{"204 error": " Cannot find overdue rentals"} + # else + render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok + # end end private diff --git a/config/routes.rb b/config/routes.rb index 501638261..032d6a246 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,8 +8,8 @@ get 'movies/:title', to: 'movies#show', as: 'movie' - post "/rentals/:title/check-out", to: "rentals#create" - patch "/rentals/:title/check-in", to: "rentals#update" + post "/rentals/:title/check-out", to: "rentals#create", as: "create_rental" + patch "/rentals/:title/check-in", to: "rentals#update", as: "update_rental" - get "/rentals/overdue", to: "rentals#overdue_rentals" + get "/rentals/overdue", to: "rentals#overdue_rentals", as: "overdue_rentals" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..b8f9bf348 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,80 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "overdue_rentals" do + before do + @customer_id = customers(:good_customer).id + @rental = { + movie_id: movies(:one).id, + customer_id: @customer_id, + check_out_date: Date.today, + due_date: Date.today + 3, + status: "checked out" + } + + + end + it 'is a real working api route' do + get overdue_rentals_path + must_respond_with :success + end + + it 'returns json' do + # rental_data = {"customer_id"=>1} + # post create_rental_path(movies(:one).title), params: {rental: rental_data } + # patch update_rental_path(movies(:one).title), params: {rental: rental_data } + get overdue_rentals_path + response.header['Content-Type'].must_include 'json' + end + + it 'returns an array of hashes' do + get overdue_rentals_path + response.parsed_body.must_be_instance_of Array + response.parsed_body.each do |overdue_rentals_hash| + movie_hash.must_be_instance_of Hash + end + end + + it 'returns the correct amount of overdue rentals' do + get overdue_rentals_path + response.parsed_body.length.must_equal Rental.where(status: "overdue").count + end + + it 'returns overdue rentals with the expected fields' do + keys = %w( check_out_date, customer_id, due_date, name, postal_code , title) + get overdue_rentals_path + response.parsed_body.each do |rental| + rental.keys.sort.must_equal keys + end + end + + # it 'returns no_content 204 error if there are no overdue movies' do + # Rental.destroy_all + # get overdue_rentals_path + # response.status.must_equal :no_content + # response.parsed_body.must_include "error" + # end + end + + describe "update" do + it "updates existing rental" do + rental_data = {"customer_id"=>1} + patch update_rental_path(movies(:one).title), params: {rental: rental_data } + end + it "changes rental status" do + + end + it " " do + + end + + + + + end + + + + + end From 6dd09c7e3c85cac7b5da25d2e68e52fe290f5929 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Thu, 11 May 2017 08:59:06 -0700 Subject: [PATCH 40/65] typis in routes --- app/controllers/rentals_controller.rb | 12 +++++------- config/routes.rb | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 36a4f084e..3caa9fd9f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,7 +2,6 @@ class RentalsController < ApplicationController - def create # example of params # {"rental"=>{ "customer_id"=>1 }, "title"=>"Psycho"} @@ -31,7 +30,7 @@ def update rental.return_date = Date.today rental.status = "checked in" - # rental.customer.movies_checked_out_count += 1 + rental.customer.movies_checked_out_count -= 1 # rental.movie.available_inventory += 1 # ?????????? if rental.save render status: :ok, json: { status: rental.status } @@ -43,11 +42,7 @@ def update def overdue_rentals overdue_rentals = Rental.overdue_movies - # if overdue_rentals.empty? - # render status: :no_content, json:{"204 error": " Cannot find overdue rentals"} - # else - render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok - # end + render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok end private @@ -55,4 +50,7 @@ def rental_params params.require(:rental).permit(:customer_id, :title, :check_out_date, :return_date, :due_date, :status) end + + + end diff --git a/config/routes.rb b/config/routes.rb index 032d6a246..799591a1b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get "customers", to: "customers#index", as: "customers" - get "customers/:id", to: "customers#show" # , as: "customer" + get "customers/:id", to: "customers#show" get 'movies', to: 'movies#index', as: 'movies' get 'movies/:title', to: 'movies#show', as: 'movie' From f69235afbed8be2633774112fc1eadc0d2e57a7f Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Thu, 11 May 2017 09:14:24 -0700 Subject: [PATCH 41/65] tests working --- test/controllers/rentals_controller_test.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b8f9bf348..3344259b5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -48,7 +48,7 @@ end end - # it 'returns no_content 204 error if there are no overdue movies' do + # it 'returns json message if there are no overdue movies' do # Rental.destroy_all # get overdue_rentals_path # response.status.must_equal :no_content @@ -57,10 +57,10 @@ end describe "update" do - it "updates existing rental" do - rental_data = {"customer_id"=>1} - patch update_rental_path(movies(:one).title), params: {rental: rental_data } - end + # it "updates existing rental" do + # rental_data = {"customer_id"=>1} + # patch update_rental_path(movies(:one).title), params: {rental: rental_data } + # end it "changes rental status" do end From 5f0bc3f2b9413de33dad01c9fead660364de33ab Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Thu, 11 May 2017 09:14:26 -0700 Subject: [PATCH 42/65] cleaned up test files --- app/controllers/rentals_controller.rb | 1 - test/controllers/customers_controller_test.rb | 4 ++-- test/models/customer_test.rb | 5 +++-- test/models/rental_test.rb | 5 +---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 129fddd2b..df4acbb1f 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -19,7 +19,6 @@ def create render status: :bad_request, json: { errors: rental.errors.messages } end else - # should we add a check if customer also DNE render status: :bad_request, json: { errors: "movie does not exist" } end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index cd84f748b..7be6d3e58 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,6 +2,7 @@ describe CustomersController do describe "index" do + it "route is working" do get customers_path must_respond_with :success @@ -32,13 +33,12 @@ end it "returns customers with exactly the required fields" do - keys = %w(id movies_checked_out_count name phone postal_code registered_at ) + keys = %w(id movies_checked_out_count name phone postal_code registered_at ) get customers_path body = JSON.parse(response.body) body.each do |customer| customer.keys.sort.must_equal keys end end - end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 8c00fc926..180b36285 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -14,8 +14,9 @@ end it "Cannot be created even if one attributes is not presented" do @input.keys.each do |key| - @input.delete(key) - customer = Customer.new(@input) + input = @input.dup + input.delete(key) + customer = Customer.new(input) result = customer.valid? result.must_equal false customer.errors.must_include key diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 75d6c1036..78f57e156 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -12,8 +12,6 @@ due_date: Date.today + 3, status: "checked out" } - - end it "requires all attributes to create instance" do @@ -23,8 +21,7 @@ Rental.find_by(customer_id: @customer_id ).wont_be_nil end - it "wont create a rental if missing an needed attribute" do - # rental = @rental_info.dup + it "wont create a rental if missing a needed attribute" do @rental_info.keys.each do |attribute| rental_info = @rental_info.dup rental_info.delete(attribute) From c5b5093b8812d946f0cce51e7f96a30da72c8aea Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Thu, 11 May 2017 10:09:11 -0700 Subject: [PATCH 43/65] tsts for overdue_movies are orking --- app/controllers/rentals_controller.rb | 8 +++- test/controllers/rentals_controller_test.rb | 52 ++++++++++----------- test/fixtures/rentals.yml | 8 ++-- 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index afcdd3208..c9ddb8c1b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -41,9 +41,15 @@ def update def overdue_rentals overdue_rentals = Rental.overdue_movies - render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok + # puts overdue_rentals + if !overdue_rentals.empty? + render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok + else + render json: {error: "No overdue rentals was found" }, status: :ok + end end + private def rental_params params.require(:rental).permit(:customer_id, :title, :check_out_date, diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 78522f689..523e1de50 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,5 +1,5 @@ require "test_helper" - +require 'date' describe RentalsController do describe 'create' do @@ -13,7 +13,7 @@ let(:rental_data) { { customer_id: @customer.id } } it 'creates a new rental' do - post rental_path(@movie.title), params: { rental: rental_data } + post create_rental_path(@movie.title), params: { rental: rental_data } must_respond_with :success response.parsed_body.must_include "id" Rental.find(response.parsed_body["id"]).movie_id.must_equal @movie.id @@ -21,29 +21,38 @@ end it 'returns bad request if given customer id DNE' do - post rental_path(@movie.title), params: { rental: { customer_id: @bad_customer_id } } + post create_rental_path(@movie.title), params: { rental: { customer_id: @bad_customer_id } } must_respond_with :bad_request response.parsed_body.must_include "errors" end it 'returns bad request if given movie title DNE' do - post rental_path("Harry Potter"), params: { rental: rental_data } + post create_rental_path("Harry Potter"), params: { rental: rental_data } must_respond_with :bad_request response.parsed_body.must_include "errors" end end describe "overdue_rentals" do - + before do + Rental.destroy_all + movie = movies(:movie1) + rental_info = { + movie_id: movie.id, + customer_id: customers(:good_customer).id, + check_out_date: Date.parse("2016-12-3"), + due_date: Date.parse("2016-12-9"), + status: "checked out" + } + @rental1 = Rental.create(rental_info) + @rental2 = Rental.create(rental_info) + end it 'is a real working api route' do get overdue_rentals_path must_respond_with :success end it 'returns json' do - # rental_data = {"customer_id"=>1} - # post create_rental_path(movies(:one).title), params: {rental: rental_data } - # patch update_rental_path(movies(:one).title), params: {rental: rental_data } get overdue_rentals_path response.header['Content-Type'].must_include 'json' end @@ -52,38 +61,29 @@ get overdue_rentals_path response.parsed_body.must_be_instance_of Array response.parsed_body.each do |overdue_rentals_hash| - movie_hash.must_be_instance_of Hash + overdue_rentals_hash.must_be_instance_of Hash end end it 'returns the correct amount of overdue rentals' do get overdue_rentals_path - response.parsed_body.length.must_equal Rental.where(status: "overdue").count + response.parsed_body.length.must_equal 2 end it 'returns overdue rentals with the expected fields' do - keys = %w( check_out_date, customer_id, due_date, name, postal_code , title) + keys = %w(check_out_date customer_id due_date name postal_code title) get overdue_rentals_path response.parsed_body.each do |rental| rental.keys.sort.must_equal keys end end - # it 'returns json message if there are no overdue movies' do - # Rental.destroy_all - # get overdue_rentals_path - # response.status.must_equal :no_content - # response.parsed_body.must_include "error" - # end - end - - describe "update" do - # it "updates existing rental" do - # rental_data = {"customer_id"=>1} - # patch update_rental_path(movies(:one).title), params: {rental: rental_data } - # end - it "changes rental status" do - + it 'returns json message if there are no overdue movies' do + Rental.destroy_all + get overdue_rentals_path + response.status.must_equal 200 + response.parsed_body.must_include "error" end end + end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 92b63cd3c..1bd8c5c26 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -5,15 +5,15 @@ # below each fixture, per the syntax in the comments below # rental1: - customer_id: good_customer - movie_id: movie1 + customer: good_customer + movie: movie1 check_out_date: 2017-05-08 due_date: 2017-05-11 status: checked out rental2: - customer_id: - movie_id: movie2 + customer: good_customer + movie: movie2 check_out_date: 2017-05-07 due_date: 2017-05-10 status: checked out From bb2ded93d39e562f2fb460a96205d61138987a95 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Thu, 11 May 2017 10:19:14 -0700 Subject: [PATCH 44/65] fixed test for overdue movies in Rentals controller --- app/controllers/rentals_controller.rb | 11 +++++------ test/controllers/rentals_controller_test.rb | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c9ddb8c1b..43f2bfded 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,9 +8,9 @@ def create movie = Movie.find_by(title: params[:title]) if movie rental_info = { - customer_id: params["rental"]["customer_id"], - movie_id: movie.id - } + customer_id: params["rental"]["customer_id"], + movie_id: movie.id + } rental = Rental.create_rental(rental_info) if rental.save render status: :ok, json: { id: rental.id } @@ -41,11 +41,10 @@ def update def overdue_rentals overdue_rentals = Rental.overdue_movies - # puts overdue_rentals if !overdue_rentals.empty? - render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok - else render json: {error: "No overdue rentals was found" }, status: :ok + else + render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 523e1de50..306a79d3c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -78,7 +78,7 @@ end end - it 'returns json message if there are no overdue movies' do + it 'returns error message if there are no overdue movies' do Rental.destroy_all get overdue_rentals_path response.status.must_equal 200 From 45685704813c7cb8017d206120bb46b7b50c7a44 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Thu, 11 May 2017 10:30:35 -0700 Subject: [PATCH 45/65] working on checked in testing - found major bug --- app/controllers/rentals_controller.rb | 1 - test/controllers/rentals_controller_test.rb | 50 ++++++++++++++++----- test/fixtures/rentals.yml | 8 ++-- test/models/rental_test.rb | 6 --- 4 files changed, 44 insertions(+), 21 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index afcdd3208..1f882047b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -38,7 +38,6 @@ def update end end - def overdue_rentals overdue_rentals = Rental.overdue_movies render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 78522f689..e4febe504 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,7 +3,6 @@ describe RentalsController do describe 'create' do - before do @bad_customer_id = Customer.all.last.id + 1 @customer = customers(:good_customer) @@ -13,7 +12,7 @@ let(:rental_data) { { customer_id: @customer.id } } it 'creates a new rental' do - post rental_path(@movie.title), params: { rental: rental_data } + post create_rental_path(@movie.title), params: { rental: rental_data } must_respond_with :success response.parsed_body.must_include "id" Rental.find(response.parsed_body["id"]).movie_id.must_equal @movie.id @@ -21,13 +20,13 @@ end it 'returns bad request if given customer id DNE' do - post rental_path(@movie.title), params: { rental: { customer_id: @bad_customer_id } } + post create_rental_path(@movie.title), params: { rental: { customer_id: @bad_customer_id } } must_respond_with :bad_request response.parsed_body.must_include "errors" end it 'returns bad request if given movie title DNE' do - post rental_path("Harry Potter"), params: { rental: rental_data } + post create_rental_path("Harry Potter"), params: { rental: rental_data } must_respond_with :bad_request response.parsed_body.must_include "errors" end @@ -62,7 +61,7 @@ end it 'returns overdue rentals with the expected fields' do - keys = %w( check_out_date, customer_id, due_date, name, postal_code , title) + keys = %w( check_out_date customer_id due_date name postal_code title ) get overdue_rentals_path response.parsed_body.each do |rental| rental.keys.sort.must_equal keys @@ -78,12 +77,43 @@ end describe "update" do - # it "updates existing rental" do - # rental_data = {"customer_id"=>1} - # patch update_rental_path(movies(:one).title), params: {rental: rental_data } - # end - it "changes rental status" do + before do + customer = customers(:good_customer) + @rental_data = { "customer_id": customer.id } + @movie = movies(:movie1) + # create a rental for this customer and movie + post create_rental_path(@movie.title), params: { rental: @rental_data } + rental_id = response.parsed_body["id"] + @rental = Rental.find_by(id: rental_id) + + end + it "a working api route" do + patch update_rental_path(@movie.title), params: { rental: @rental_data } + must_respond_with :success + end + + it 'returns json' do + patch update_rental_path(@movie.title), params: { rental: @rental_data } + response.header['Content-Type'].must_include 'json' + end + + it "changes rental status" do + puts "rental before" + p @rental + + patch update_rental_path(@movie.title), params: { rental: @rental_data } + # p response.parsed_body + response.parsed_body.must_include "status" + rental = @rental.reload + # p Rental.all + + rental = Rental.find(rental.id) + puts "rental after" + p rental + puts "print all" + p Rental.all + rental.status.must_equal "checked in" end end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 92b63cd3c..1bd8c5c26 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -5,15 +5,15 @@ # below each fixture, per the syntax in the comments below # rental1: - customer_id: good_customer - movie_id: movie1 + customer: good_customer + movie: movie1 check_out_date: 2017-05-08 due_date: 2017-05-11 status: checked out rental2: - customer_id: - movie_id: movie2 + customer: good_customer + movie: movie2 check_out_date: 2017-05-07 due_date: 2017-05-10 status: checked out diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 211a1eed4..ee860f73b 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -31,9 +31,6 @@ end end - - - describe "self.overdue_movies" do it "returns instance of Array" do rental1 = Rental.new(@rental_info) @@ -56,8 +53,5 @@ movie.due_date.must_be :<, Date.today end end - - - end end From 260436db0d108469cb17a91bf0951d4e4ebfd79e Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Thu, 11 May 2017 17:24:55 -0700 Subject: [PATCH 46/65] tests for overdue movies are working --- app/controllers/rentals_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 43f2bfded..b42db7cb6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -29,7 +29,7 @@ def update rental.return_date = Date.today rental.status = "checked in" - rental.customer.movies_checked_out_count -= 1 + # rental.customer.movies_checked_out_count -= 1 # rental.movie.available_inventory += 1 # ?????????? if rental.save render status: :ok, json: { status: rental.status } @@ -41,7 +41,7 @@ def update def overdue_rentals overdue_rentals = Rental.overdue_movies - if !overdue_rentals.empty? + if overdue_rentals.empty? render json: {error: "No overdue rentals was found" }, status: :ok else render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok From 0831f1e42c18e389dfd8cbe7a5a5eb1fcd1700f4 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Thu, 11 May 2017 18:31:40 -0700 Subject: [PATCH 47/65] make update inventory work in create method --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 46 ++++++++++++++++++--------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 66f1700c6..a49b6be08 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - + if movies.empty? render json: { errors: "Something is wrong with the database" }, status: :internal_server_error diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b42db7cb6..9c2b9192d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,8 +3,6 @@ class RentalsController < ApplicationController def create - # example of params - # {"rental"=>{ "customer_id"=>1 }, "title"=>"Psycho"} movie = Movie.find_by(title: params[:title]) if movie rental_info = { @@ -12,10 +10,24 @@ def create movie_id: movie.id } rental = Rental.create_rental(rental_info) - if rental.save - render status: :ok, json: { id: rental.id } + + if Rental.where(movie_id: movie.id, status: "checked out").length == 0 + rental.movie.available_inventory = rental.movie.inventory + rental.movie.save + end + + if rental.movie.available_inventory > 0 + rental.movie.available_inventory -= 1 + rental.movie.save + rental.customer.movies_checked_out_count += 1 + rental.customer.save + if rental.save + render status: :ok, json: { id: rental.id } + else + render status: :bad_request, json: { errors: rental.errors.messages } + end else - render status: :bad_request, json: { errors: rental.errors.messages } + render status: :ok, json: { error: "Movie is not available for checkout"} end else render status: :bad_request, json: { errors: "movie does not exist" } @@ -25,16 +37,21 @@ def create def update movie = Movie.find_by(title: params[:title]) rental = Rental.find_by(movie_id: movie.id, customer_id: params["rental"]["customer_id"]) - - rental.return_date = Date.today - rental.status = "checked in" - - # rental.customer.movies_checked_out_count -= 1 - # rental.movie.available_inventory += 1 # ?????????? - if rental.save - render status: :ok, json: { status: rental.status } + if rental.status = "checked in" + render status: :ok, json: { error: "Movie is already checked in" } else - render status: :bad_request, json: { errors: rental.errors.messages } + rental.return_date = Date.today + rental.status = "checked in" + rental.customer.movies_checked_out_count -= 1 + rental.customer.save + rental.movie.available_inventory += 1 + rental.movie.save + + if rental.save + render status: :ok, json: { status: rental.status } + else + render status: :bad_request, json: { errors: rental.errors.messages } + end end end @@ -56,5 +73,4 @@ def rental_params end - end From 8e0cebe368a4b5f26909b7d633b2d95c99b93eb1 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Thu, 11 May 2017 18:50:50 -0700 Subject: [PATCH 48/65] make update inventory work in create method --- app/controllers/movies_controller.rb | 4 ++-- app/controllers/rentals_controller.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a49b6be08..d6672df37 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - + if movies.empty? render json: { errors: "Something is wrong with the database" }, status: :internal_server_error @@ -11,7 +11,7 @@ def index end def show - movie = Movie.find_by( title: params[:title]) + movie = Movie.find_by(title: params[:title]) if movie == nil render status: :not_found, json:{ "404 error": { "title": ["Movie #{params[:title]} not found"] } diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9c2b9192d..d84709b31 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -42,6 +42,7 @@ def update else rental.return_date = Date.today rental.status = "checked in" + rental.customer.movies_checked_out_count -= 1 rental.customer.save rental.movie.available_inventory += 1 From 09db5de7ee490d01847f179e2da10c9f54d63688 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Thu, 11 May 2017 19:13:19 -0700 Subject: [PATCH 49/65] create and update works but two tests now are failing --- app/controllers/rentals_controller.rb | 4 ++-- app/serializers/movie_serializer.rb | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d84709b31..73fb68489 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -37,12 +37,12 @@ def create def update movie = Movie.find_by(title: params[:title]) rental = Rental.find_by(movie_id: movie.id, customer_id: params["rental"]["customer_id"]) - if rental.status = "checked in" + if rental.status == "checked in" render status: :ok, json: { error: "Movie is already checked in" } else rental.return_date = Date.today rental.status = "checked in" - + rental.customer.movies_checked_out_count -= 1 rental.customer.save rental.movie.available_inventory += 1 diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb index 8ecd37d50..0f43d1433 100644 --- a/app/serializers/movie_serializer.rb +++ b/app/serializers/movie_serializer.rb @@ -1,3 +1,26 @@ class MovieSerializer < ActiveModel::Serializer attributes :title, :overview, :release_date, :inventory, :available_inventory + + + def available_inventory + if object.available_inventory == 0 && no_rentals?(object) + return object.inventory + else + return object.available_inventory + end + end + + + def no_rentals?(object) + object.rentals.each do |rental| + if rental.status == "checked out" + return false + end + end + return true + end + + + + end From 098049eef6105603b11fd312c5eb0decd5b9cc77 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 10:36:49 -0700 Subject: [PATCH 50/65] added a current duplicate rental check --- app/controllers/rentals_controller.rb | 22 ++++++++++++++-------- app/models/rental.rb | 11 ++++------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1f882047b..dbb8081f9 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,18 +7,25 @@ def create # {"rental"=>{ "customer_id"=>1 }, "title"=>"Psycho"} movie = Movie.find_by(title: params[:title]) if movie - rental_info = { - customer_id: params["rental"]["customer_id"], + rental_info = { customer_id: params["rental"]["customer_id"], movie_id: movie.id } + else + render status: :bad_request, json: { errors: "movie does not exist" } + end + + if Rental.where(status: "checked out", + movie_id: movie.id, + customer_id: params["rental"]["customer_id"]).length > 0 + render status: :bad_request, json: { error: "Customer has this movie currently checked out" } + else rental = Rental.create_rental(rental_info) - if rental.save - render status: :ok, json: { id: rental.id } + if rental.errors.empty? + rental.save + render status: :ok, json: { rental_id: rental.id } else render status: :bad_request, json: { errors: rental.errors.messages } end - else - render status: :bad_request, json: { errors: "movie does not exist" } end end @@ -28,9 +35,8 @@ def update rental.return_date = Date.today rental.status = "checked in" - rental.customer.movies_checked_out_count -= 1 - # rental.movie.available_inventory += 1 # ?????????? + if rental.save render status: :ok, json: { status: rental.status } else diff --git a/app/models/rental.rb b/app/models/rental.rb index 2c44e4d53..87bf38929 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,25 +3,24 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer validates :check_out_date, presence: true - # validates :return_date, presence: true validates :due_date, presence: true - validates :status , presence: true, inclusion: { in: [ "checked out", "checked in", "overdue"] } + validates :status , presence: true, inclusion: { in: [ "checked out", "checked in", "overdue" ] } + validates :return_date, presence: true, on: :update + # {"rental"=>{"customer_id"=>1, "date"=>"2017-05-10"}, "title"=>"Psycho"} # {customer_id => 1, movie_id => #} def self.create_rental(info) rental = Rental.new - # find_movie ? bad design to call Movie.find_by in Rental class - # movie = Movie.find_by(title: info["title"]) rental.movie_id = info[:movie_id] rental.customer_id = info[:customer_id] rental.check_out_date = Date.today rental.due_date = Date.today + 3 rental.status = "checked out" + rental.valid? return rental end - def self.overdue_movies array_of_overdues = [] Rental.all.each do |rental| @@ -34,6 +33,4 @@ def self.overdue_movies end return array_of_overdues end - - end From dfb4c7bbddc434c2318e42131f039096fdb0f8b1 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Fri, 12 May 2017 10:47:44 -0700 Subject: [PATCH 51/65] available inventory working --- app/controllers/rentals_controller.rb | 85 ++++++++++++--------- app/models/rental.rb | 6 +- app/serializers/movie_serializer.rb | 9 +-- test/controllers/rentals_controller_test.rb | 4 +- test/fixtures/movies.yml | 3 + 5 files changed, 58 insertions(+), 49 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 73fb68489..732f3d279 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,5 @@ -# require 'date' - class RentalsController < ApplicationController - +# before_action :find_movie, only: [:create, :update] def create movie = Movie.find_by(title: params[:title]) if movie @@ -9,51 +7,58 @@ def create customer_id: params["rental"]["customer_id"], movie_id: movie.id } - rental = Rental.create_rental(rental_info) - - if Rental.where(movie_id: movie.id, status: "checked out").length == 0 - rental.movie.available_inventory = rental.movie.inventory - rental.movie.save - end + if Rental.where(status: "checked out", movie_id: movie.id, + customer_id: params["rental"]["customer_id"]).length > 0 + render status: :bad_request, json: { error: "Customer already checked out this movie."} + else + rental = Rental.create_rental(rental_info) + set_up_available_inventory(rental, movie) - if rental.movie.available_inventory > 0 - rental.movie.available_inventory -= 1 - rental.movie.save - rental.customer.movies_checked_out_count += 1 - rental.customer.save - if rental.save - render status: :ok, json: { id: rental.id } + if rental.movie.available_inventory > 0 + rental.movie.available_inventory -= 1 + rental.movie.save + rental.customer.movies_checked_out_count += 1 + rental.customer.save + if rental.save + render status: :ok, json: { id: rental.id } + else + render status: :bad_request, json: { errors: rental.errors.messages } + end else - render status: :bad_request, json: { errors: rental.errors.messages } + render status: :ok, json: { error: "Movie is not available for checkout. Available inventory = 0"} end - else - render status: :ok, json: { error: "Movie is not available for checkout"} end else - render status: :bad_request, json: { errors: "movie does not exist" } + render status: :bad_request, json: { errors: "Movie does not exist" } end end + def update + # make sure that user cannot check in movie he/she did not checked out: movie = Movie.find_by(title: params[:title]) - rental = Rental.find_by(movie_id: movie.id, customer_id: params["rental"]["customer_id"]) - if rental.status == "checked in" - render status: :ok, json: { error: "Movie is already checked in" } + if Rental.where(status: "checked out", movie_id: movie.id, + customer_id: params["rental"]["customer_id"]).length == 0 + render status: :bad_request, json: { error: "You cannot check in movie, that you did not checked out "} else - rental.return_date = Date.today - rental.status = "checked in" - - rental.customer.movies_checked_out_count -= 1 - rental.customer.save - rental.movie.available_inventory += 1 - rental.movie.save - - if rental.save - render status: :ok, json: { status: rental.status } + rental = Rental.find_by(movie_id: movie.id, customer_id: params["rental"]["customer_id"]) + if rental.status == "checked in" + render status: :ok, json: { error: "Movie is already checked in" } else - render status: :bad_request, json: { errors: rental.errors.messages } + rental.return_date = Date.today + rental.status = "checked in" + rental.customer.movies_checked_out_count -= 1 + rental.customer.save + rental.movie.available_inventory += 1 + rental.movie.save + if rental.save + render status: :ok, json: { status: rental.status } + else + render status: :bad_request, json: { errors: rental.errors.messages } + end end end + end @@ -66,12 +71,22 @@ def overdue_rentals end end - private + + def set_up_available_inventory(rental, movie) + if Rental.where(movie_id: movie.id, status: "checked out").length == 0 + rental.movie.available_inventory = rental.movie.inventory + rental.movie.save + end + end def rental_params params.require(:rental).permit(:customer_id, :title, :check_out_date, :return_date, :due_date, :status) end + # def find_movie + # movie = Movie.find_by(title: params[:title]) + # end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 2c44e4d53..9b23209c3 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,12 +7,9 @@ class Rental < ApplicationRecord validates :due_date, presence: true validates :status , presence: true, inclusion: { in: [ "checked out", "checked in", "overdue"] } - # {"rental"=>{"customer_id"=>1, "date"=>"2017-05-10"}, "title"=>"Psycho"} - # {customer_id => 1, movie_id => #} + def self.create_rental(info) rental = Rental.new - # find_movie ? bad design to call Movie.find_by in Rental class - # movie = Movie.find_by(title: info["title"]) rental.movie_id = info[:movie_id] rental.customer_id = info[:customer_id] rental.check_out_date = Date.today @@ -21,7 +18,6 @@ def self.create_rental(info) return rental end - def self.overdue_movies array_of_overdues = [] Rental.all.each do |rental| diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb index 0f43d1433..b53826bd2 100644 --- a/app/serializers/movie_serializer.rb +++ b/app/serializers/movie_serializer.rb @@ -10,17 +10,12 @@ def available_inventory end end - def no_rentals?(object) object.rentals.each do |rental| - if rental.status == "checked out" - return false - end + return false if rental.status == "checked out" end return true end - - - + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 306a79d3c..04f20540e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -13,10 +13,10 @@ let(:rental_data) { { customer_id: @customer.id } } it 'creates a new rental' do - post create_rental_path(@movie.title), params: { rental: rental_data } + post create_rental_path(movies(:movie3).title), params: { rental: rental_data } must_respond_with :success response.parsed_body.must_include "id" - Rental.find(response.parsed_body["id"]).movie_id.must_equal @movie.id + Rental.find(response.parsed_body["id"]).movie_id.must_equal movies(:movie3).id Rental.find(response.parsed_body["id"]).customer_id.must_equal @customer.id end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 7d969a18c..38cb61760 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -9,15 +9,18 @@ movie1: overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. release_date: 1960-06-16 inventory: 8 + available_inventory: 8 movie2: title: Psycho overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. release_date: 1960-06-16 inventory: 8 + available_inventory: 8 movie3: title: Jaws overview: An insatiable great white shark terrorizes the townspeople of Amity Island, The police chief, an oceanographer and a grizzled shark hunter seek to destroy the bloodthirsty beast. release_date: 1975-06-19 inventory: 6 + available_inventory: 8 From 34348b91c41c352bdd6a9a383379607e38f1253e Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Fri, 12 May 2017 11:07:45 -0700 Subject: [PATCH 52/65] added available inventory method to controller --- app/controllers/rentals_controller.rb | 38 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 732f3d279..2c7356be4 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,31 +2,37 @@ class RentalsController < ApplicationController # before_action :find_movie, only: [:create, :update] def create movie = Movie.find_by(title: params[:title]) + if movie rental_info = { customer_id: params["rental"]["customer_id"], movie_id: movie.id } - if Rental.where(status: "checked out", movie_id: movie.id, - customer_id: params["rental"]["customer_id"]).length > 0 - render status: :bad_request, json: { error: "Customer already checked out this movie."} - else - rental = Rental.create_rental(rental_info) - set_up_available_inventory(rental, movie) + if Customer.find_by(id: params["rental"]["customer_id"]) != nil + if Rental.where(status: "checked out", movie_id: movie.id, + customer_id: params["rental"]["customer_id"]).length > 0 + render status: :bad_request, json: { error: "Customer already checked out this movie."} + else + rental = Rental.create_rental(rental_info) + set_up_available_inventory(rental, movie) - if rental.movie.available_inventory > 0 - rental.movie.available_inventory -= 1 - rental.movie.save - rental.customer.movies_checked_out_count += 1 - rental.customer.save - if rental.save - render status: :ok, json: { id: rental.id } + if rental.movie.available_inventory > 0 + rental.movie.available_inventory -= 1 + rental.movie.save + rental.customer.movies_checked_out_count += 1 + rental.customer.save + if rental.save + + render status: :ok, json: { id: rental.id } + else + render status: :bad_request, json: { errors: rental.errors.messages } + end else - render status: :bad_request, json: { errors: rental.errors.messages } + render status: :ok, json: { error: "Movie is not available for checkout. Available inventory = 0"} end - else - render status: :ok, json: { error: "Movie is not available for checkout. Available inventory = 0"} end + else + render status: :bad_request, json: { error: "Customer with id #{params["rental"]["customer_id"]} does not exist"} end else render status: :bad_request, json: { errors: "Movie does not exist" } From 38f152b7117f6f4c21339bd6ec0a070bba62be06 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 11:08:24 -0700 Subject: [PATCH 53/65] working on rentals controller tests --- app/controllers/rentals_controller.rb | 34 ++++++++++----------- test/controllers/rentals_controller_test.rb | 22 +++++++++---- test/fixtures/customers.yml | 3 +- test/fixtures/movies.yml | 2 +- test/models/rental_test.rb | 2 +- 5 files changed, 37 insertions(+), 26 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index dbb8081f9..8b15dad77 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,25 +7,28 @@ def create # {"rental"=>{ "customer_id"=>1 }, "title"=>"Psycho"} movie = Movie.find_by(title: params[:title]) if movie + + rental_info = { customer_id: params["rental"]["customer_id"], movie_id: movie.id } - else - render status: :bad_request, json: { errors: "movie does not exist" } - end - if Rental.where(status: "checked out", - movie_id: movie.id, - customer_id: params["rental"]["customer_id"]).length > 0 - render status: :bad_request, json: { error: "Customer has this movie currently checked out" } - else - rental = Rental.create_rental(rental_info) - if rental.errors.empty? - rental.save - render status: :ok, json: { rental_id: rental.id } + if Rental.where(status: "checked out", + movie_id: movie.id, + customer_id: params["rental"]["customer_id"]).length > 0 + render status: :bad_request, json: { error: "Customer has this movie currently checked out" } else - render status: :bad_request, json: { errors: rental.errors.messages } + rental = Rental.create_rental(rental_info) + if rental.errors.empty? + rental.save + render status: :ok, json: { rental_id: rental.id } + else + render status: :bad_request, json: { errors: rental.errors.messages } + end end + + else + render status: :bad_request, json: { errors: "movie does not exist" } end end @@ -36,7 +39,7 @@ def update rental.return_date = Date.today rental.status = "checked in" rental.customer.movies_checked_out_count -= 1 - + if rental.save render status: :ok, json: { status: rental.status } else @@ -54,7 +57,4 @@ def rental_params params.require(:rental).permit(:customer_id, :title, :check_out_date, :return_date, :due_date, :status) end - - - end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e4febe504..7c36f93d2 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,8 +5,8 @@ describe 'create' do before do @bad_customer_id = Customer.all.last.id + 1 - @customer = customers(:good_customer) - @movie = movies(:movie1) + @customer = customers(:good_customer2) + @movie = movies(:movie3) end let(:rental_data) { { customer_id: @customer.id } } @@ -14,9 +14,17 @@ it 'creates a new rental' do post create_rental_path(@movie.title), params: { rental: rental_data } must_respond_with :success - response.parsed_body.must_include "id" - Rental.find(response.parsed_body["id"]).movie_id.must_equal @movie.id - Rental.find(response.parsed_body["id"]).customer_id.must_equal @customer.id + response.parsed_body.must_include "rental_id" + Rental.find(response.parsed_body["rental_id"]).movie_id.must_equal @movie.id + Rental.find(response.parsed_body["rental_id"]).customer_id.must_equal @customer.id + end + + it 'wont create a rental if customer already has that movie checked out' do + post create_rental_path(@movie.title), params: { rental: rental_data } + must_respond_with :success + post create_rental_path(@movie.title), params: { rental: rental_data } + must_respond_with :bad_request + reponse.parsed_body.must_include "errors" end it 'returns bad request if given customer id DNE' do @@ -48,14 +56,16 @@ end it 'returns an array of hashes' do + skip get overdue_rentals_path response.parsed_body.must_be_instance_of Array response.parsed_body.each do |overdue_rentals_hash| - movie_hash.must_be_instance_of Hash + overdue_rentals_hash.must_be_instance_of Hash end end it 'returns the correct amount of overdue rentals' do + skip get overdue_rentals_path response.parsed_body.length.must_equal Rental.where(status: "overdue").count end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index aa8ae6a10..3a3e9a3da 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -14,7 +14,8 @@ good_customer: postal_code: 12345 phone: (234) 837-2886 -bad_customer1: +good_customer2: + name: cyn bin registered_at: August 11 2014 address: 123 Fake street city: Bellevue diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 7d969a18c..4d1655f9f 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -11,7 +11,7 @@ movie1: inventory: 8 movie2: - title: Psycho + title: Psycho2 overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. release_date: 1960-06-16 inventory: 8 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index ee860f73b..b3d4b35fc 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -6,7 +6,7 @@ before do @customer_id = customers(:good_customer).id @rental_info = { - movie_id: movies(:movie1).id, + movie_id: movies(:movie3).id, customer_id: @customer_id, check_out_date: Date.today, due_date: Date.today + 3, From 0ce4434b329763a13dc4c377f354f9aac6d190da Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 12:30:01 -0700 Subject: [PATCH 54/65] rental checkin and overdue passing tests --- app/controllers/rentals_controller.rb | 6 +++- app/models/rental.rb | 6 ++-- test/controllers/rentals_controller_test.rb | 39 +++++++++++++-------- test/fixtures/rentals.yml | 7 ++++ test/models/rental_test.rb | 4 +++ 5 files changed, 45 insertions(+), 17 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8b15dad77..91fd8c935 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -49,7 +49,11 @@ def update def overdue_rentals overdue_rentals = Rental.overdue_movies - render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok + if overdue_rentals.empty? + render json: { message: "No overdue rentals was found" }, status: :ok + else + render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok + end end private diff --git a/app/models/rental.rb b/app/models/rental.rb index 87bf38929..3066749e8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -5,7 +5,8 @@ class Rental < ApplicationRecord validates :check_out_date, presence: true validates :due_date, presence: true validates :status , presence: true, inclusion: { in: [ "checked out", "checked in", "overdue" ] } - validates :return_date, presence: true, on: :update + # this validation also ran on overdue_movies - not just controller update + # validates :return_date, presence: true, on: :update # {"rental"=>{"customer_id"=>1, "date"=>"2017-05-10"}, "title"=>"Psycho"} @@ -17,7 +18,8 @@ def self.create_rental(info) rental.check_out_date = Date.today rental.due_date = Date.today + 3 rental.status = "checked out" - rental.valid? + # rental.check_inventory + rental.valid? # can add validation to check inventory return rental end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7c36f93d2..fbb80fb6f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -24,7 +24,18 @@ must_respond_with :success post create_rental_path(@movie.title), params: { rental: rental_data } must_respond_with :bad_request - reponse.parsed_body.must_include "errors" + response.parsed_body.must_include "error" + end + + it 'allows a customre to checkout out a movie again, if repeat rentals status is checked in' do + post create_rental_path(@movie.title), params: { rental: rental_data } + must_respond_with :success + patch update_rental_path(@movie.title), params: { rental: rental_data } + must_respond_with :success + post create_rental_path(@movie.title), params: { rental: rental_data } + must_respond_with :success + # repeat_rentals = @customer.rentals.where(movie_id: @movie.id) + # repeat_rentals.each {|rental| rental.} end it 'returns bad request if given customer id DNE' do @@ -48,15 +59,12 @@ end it 'returns json' do - # rental_data = {"customer_id"=>1} - # post create_rental_path(movies(:one).title), params: {rental: rental_data } - # patch update_rental_path(movies(:one).title), params: {rental: rental_data } get overdue_rentals_path response.header['Content-Type'].must_include 'json' end it 'returns an array of hashes' do - skip + # skip get overdue_rentals_path response.parsed_body.must_be_instance_of Array response.parsed_body.each do |overdue_rentals_hash| @@ -65,9 +73,9 @@ end it 'returns the correct amount of overdue rentals' do - skip get overdue_rentals_path - response.parsed_body.length.must_equal Rental.where(status: "overdue").count + overdue_rentals = Rental.where(status: "overdue") + response.parsed_body.length.must_equal overdue_rentals.length end it 'returns overdue rentals with the expected fields' do @@ -78,12 +86,15 @@ end end - # it 'returns json message if there are no overdue movies' do - # Rental.destroy_all - # get overdue_rentals_path - # response.status.must_equal :no_content - # response.parsed_body.must_include "error" - # end + it 'returns json message if there are no overdue movies' do + Rental.destroy_all + get overdue_rentals_path + # learning note: status will return the HTTP status code + # response.status.must_equal 200 + # learning note: must_respond_with lets you test to the HTTP status message + must_respond_with :success + response.parsed_body.must_include "message" + end end describe "update" do @@ -93,7 +104,7 @@ @movie = movies(:movie1) # create a rental for this customer and movie post create_rental_path(@movie.title), params: { rental: @rental_data } - rental_id = response.parsed_body["id"] + rental_id = response.parsed_body["rental_id"] @rental = Rental.find_by(id: rental_id) end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 1bd8c5c26..ba62b58db 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -17,3 +17,10 @@ rental2: check_out_date: 2017-05-07 due_date: 2017-05-10 status: checked out + +rental3: + customer: good_customer2 + movie: movie1 + check_out_date: 2017-05-05 + due_date: 2017-05-08 + status: overdue diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index b3d4b35fc..1258a6fba 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -32,6 +32,7 @@ end describe "self.overdue_movies" do + it "returns instance of Array" do rental1 = Rental.new(@rental_info) rental1.save @@ -39,15 +40,18 @@ rental2.save Rental.overdue_movies.must_be_kind_of Array end + it "returns rentals with status overdue" do Rental.overdue_movies.each do |movie| movie.status.must_equal "overdue" end end + it "returns empty array if no overdue rentals was found" do Rental.destroy_all Rental.overdue_movies.must_be_empty end + it "returns rentals which due_date is before today" do Rental.overdue_movies.each do |movie| movie.due_date.must_be :<, Date.today From 0fbb0c235e8378fddc7e207637461cd360600584 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 12:31:52 -0700 Subject: [PATCH 55/65] removed rental update tests to prepare for merge --- test/controllers/rentals_controller_test.rb | 41 --------------------- 1 file changed, 41 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index fbb80fb6f..66a5a1cfa 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -96,45 +96,4 @@ response.parsed_body.must_include "message" end end - - describe "update" do - before do - customer = customers(:good_customer) - @rental_data = { "customer_id": customer.id } - @movie = movies(:movie1) - # create a rental for this customer and movie - post create_rental_path(@movie.title), params: { rental: @rental_data } - rental_id = response.parsed_body["rental_id"] - @rental = Rental.find_by(id: rental_id) - - end - - it "a working api route" do - patch update_rental_path(@movie.title), params: { rental: @rental_data } - must_respond_with :success - end - - it 'returns json' do - patch update_rental_path(@movie.title), params: { rental: @rental_data } - response.header['Content-Type'].must_include 'json' - end - - it "changes rental status" do - puts "rental before" - p @rental - - patch update_rental_path(@movie.title), params: { rental: @rental_data } - # p response.parsed_body - response.parsed_body.must_include "status" - rental = @rental.reload - # p Rental.all - - rental = Rental.find(rental.id) - puts "rental after" - p rental - puts "print all" - p Rental.all - rental.status.must_equal "checked in" - end - end end From 04dbdb384a5de5dade308528c763eed030290472 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Fri, 12 May 2017 12:32:40 -0700 Subject: [PATCH 56/65] trying to refactor creTE IN RENTALS CONTROLLER --- app/controllers/rentals_controller.rb | 8 +++----- test/controllers/rentals_controller_test.rb | 10 +++++++++- test/fixtures/movies.yml | 7 +++++++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2c7356be4..e827df758 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,33 +2,30 @@ class RentalsController < ApplicationController # before_action :find_movie, only: [:create, :update] def create movie = Movie.find_by(title: params[:title]) - if movie rental_info = { customer_id: params["rental"]["customer_id"], movie_id: movie.id } - if Customer.find_by(id: params["rental"]["customer_id"]) != nil + if Customer.find_by(id: params["rental"]["customer_id"]) != nil if Rental.where(status: "checked out", movie_id: movie.id, customer_id: params["rental"]["customer_id"]).length > 0 render status: :bad_request, json: { error: "Customer already checked out this movie."} else rental = Rental.create_rental(rental_info) set_up_available_inventory(rental, movie) - if rental.movie.available_inventory > 0 rental.movie.available_inventory -= 1 rental.movie.save rental.customer.movies_checked_out_count += 1 rental.customer.save if rental.save - render status: :ok, json: { id: rental.id } else render status: :bad_request, json: { errors: rental.errors.messages } end else - render status: :ok, json: { error: "Movie is not available for checkout. Available inventory = 0"} + render status: :bad_request, json: { error: "Movie is not available for checkout. Available inventory = 0"} end end else @@ -40,6 +37,7 @@ def create end + def update # make sure that user cannot check in movie he/she did not checked out: movie = Movie.find_by(title: params[:title]) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 04f20540e..e14d92f2a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -23,7 +23,7 @@ it 'returns bad request if given customer id DNE' do post create_rental_path(@movie.title), params: { rental: { customer_id: @bad_customer_id } } must_respond_with :bad_request - response.parsed_body.must_include "errors" + response.parsed_body.must_include "error" end it 'returns bad request if given movie title DNE' do @@ -31,6 +31,9 @@ must_respond_with :bad_request response.parsed_body.must_include "errors" end + + + end describe "overdue_rentals" do @@ -84,6 +87,11 @@ response.status.must_equal 200 response.parsed_body.must_include "error" end + + + + + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 38cb61760..c621f7373 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -24,3 +24,10 @@ movie3: release_date: 1975-06-19 inventory: 6 available_inventory: 8 + +movie4: + title: Jaws + overview: An insatiable great white shark terrorizes the townspeople of Amity Island, The police chief, an oceanographer and a grizzled shark hunter seek to destroy the bloodthirsty beast. + release_date: 1975-06-19 + inventory: 6 + available_inventory: 0 From 517c0601fe4dde79acabbb91fa947a4530d47e4c Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 14:19:49 -0700 Subject: [PATCH 57/65] added check inventory rental validation --- app/controllers/rentals_controller.rb | 3 --- app/models/rental.rb | 15 +++++++++++++-- db/migrate/20170509212649_create_movies.rb | 2 +- db/schema.rb | 6 +++--- db/seeds.rb | 1 + test/fixtures/movies.yml | 11 +++++++++++ test/models/rental_test.rb | 20 ++++++++++++++++++++ 7 files changed, 49 insertions(+), 9 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 55a2dcc73..0f5ada5f9 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -55,7 +55,6 @@ def update end end - def overdue_rentals overdue_rentals = Rental.overdue_movies if overdue_rentals.empty? @@ -65,8 +64,6 @@ def overdue_rentals end end - - private def rental_params params.require(:rental).permit(:customer_id, :title, :check_out_date, diff --git a/app/models/rental.rb b/app/models/rental.rb index 3066749e8..6ab5f5b60 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,7 +4,8 @@ class Rental < ApplicationRecord belongs_to :customer validates :check_out_date, presence: true validates :due_date, presence: true - validates :status , presence: true, inclusion: { in: [ "checked out", "checked in", "overdue" ] } + validates :status, inclusion: { in: [ "checked out", "checked in", "overdue" ] } + validate :movie_id, :check_inventory # this validation also ran on overdue_movies - not just controller update # validates :return_date, presence: true, on: :update @@ -18,7 +19,7 @@ def self.create_rental(info) rental.check_out_date = Date.today rental.due_date = Date.today + 3 rental.status = "checked out" - # rental.check_inventory + rental.manage_inventory rental.valid? # can add validation to check inventory return rental end @@ -35,4 +36,14 @@ def self.overdue_movies end return array_of_overdues end + +private + + def check_inventory + movie = self.movie + # movie = Movie.find_by(:id rental.movie_id) + if movie.nil? || movie.available_inventory == 0 || movie.available_inventory.nil? + errors.add(:movie_id, "no available inventory") + end + end end diff --git a/db/migrate/20170509212649_create_movies.rb b/db/migrate/20170509212649_create_movies.rb index d2f5f49a0..18db6c02d 100644 --- a/db/migrate/20170509212649_create_movies.rb +++ b/db/migrate/20170509212649_create_movies.rb @@ -5,7 +5,7 @@ def change t.string :overview t.string :release_date t.integer :inventory - t.integer :available_inventory, default: 0 + t.integer :available_inventory t.timestamps end end diff --git a/db/schema.rb b/db/schema.rb index d071d8d4b..cd92f0fdc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -33,9 +33,9 @@ t.string "overview" t.string "release_date" t.integer "inventory" - t.integer "available_inventory", default: 0 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "available_inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "rentals", force: :cascade do |t| diff --git a/db/seeds.rb b/db/seeds.rb index 46663b2c3..21e49d16b 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -11,6 +11,7 @@ movies = JSON.parse(raw_data) movies.each do |movie| + movie["available_inventory"] = movie["inventory"] Movie.create(movie) end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d0218b8a0..de013a99f 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -9,21 +9,32 @@ movie1: overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. release_date: 1960-06-16 inventory: 8 + available_inventory: 8 movie2: title: Psycho2 overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. release_date: 1960-06-16 inventory: 8 + available_inventory: 8 movie3: title: Jaws overview: An insatiable great white shark terrorizes the townspeople of Amity Island, The police chief, an oceanographer and a grizzled shark hunter seek to destroy the bloodthirsty beast. release_date: 1975-06-19 inventory: 6 + available_inventory: 6 movie4: title: Gaslight overview: In the late 19th century, Paula Alquist is studying music in Italy, but ends up abandoning her classes because she's fallen in love with the gallant Gregory Anton. The couple marries and moves to England to live in a home inherited by Paula from her aunt, herself a famous singer, who was mysteriously murdered in the house ten years before. Once they have moved in, Gregory, who is in reality a jewel thief and the murderer of Paula's aunt, launches a campaign of terror designed to drive his new bride insane. Though Paula is certain that she sees the house's gaslights dim every evening and that there are strange noises coming from the attic, Gregory convinces Paula that she's imagining things. Gregory's efforts to make Paula unstable are aided by an impertinent maid, Nancy. Meanwhile, a Scotland Yard inspector, Brian Cameron, becomes suspicious of Gregory and sympathetic to Paula's plight. release_date: 1944-05-04 inventory: 8 + available_inventory: 8 + +movie_not_available: + title: Jaws2 + overview: Jaws comes back + release_date: 1972-04-22 + inventory: 2 + available_inventory: 0 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1258a6fba..347ec314d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -58,4 +58,24 @@ end end end + + describe 'check_inventory' do + before do + @movie = movies(:movie_not_available) + @customer = customers(:good_customer2) + @rental_data = { + customer_id: @customer.id, + movie_id: @movie.id, + check_out_date: Date.today, + due_date: Date.today + 3 + } + + end + + it "wont validate a rental if there is not enough inventory" do + rental = Rental.new(@rental_data) + rental.valid?.must_equal false + rental.errors.messages.must_include :movie_id + end + end end From d8eae4c185f2aacf6baecea6216c9b5f16852405 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 14:27:12 -0700 Subject: [PATCH 58/65] added check inventory rental validation --- app/models/rental.rb | 2 +- test/fixtures/movies.yml | 7 +++++++ test/models/rental_test.rb | 22 ++++++++++++++++++---- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 6ab5f5b60..bc14eeaa1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -19,7 +19,7 @@ def self.create_rental(info) rental.check_out_date = Date.today rental.due_date = Date.today + 3 rental.status = "checked out" - rental.manage_inventory + # rental.manage_inventory rental.valid? # can add validation to check inventory return rental end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index de013a99f..2a0d07e5d 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -38,3 +38,10 @@ movie_not_available: release_date: 1972-04-22 inventory: 2 available_inventory: 0 + +movie_one_copy: + title: Jaws3 + overview: Jaws comes back again again + release_date: 1982-04-22 + inventory: 1 + available_inventory: 1 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 347ec314d..7d119d408 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -59,21 +59,35 @@ end end + # does this need its own describ block describe 'check_inventory' do before do - @movie = movies(:movie_not_available) + # @movie_not_available = movies(:movie_not_available) @customer = customers(:good_customer2) - @rental_data = { + @bad_rental = { customer_id: @customer.id, - movie_id: @movie.id, + movie_id: movies(:movie_not_available).id, check_out_date: Date.today, due_date: Date.today + 3 } + # @movie_one_copy = movies(:movie_one_copy) + @good_rental = { + customer_id: @customer.id, + movie_id: movies(:movie_one_copy).id, + check_out_date: Date.today, + due_date: Date.today + 3 + } + end + + # edge case 1 in inventory - 1 available + it "will validate a rental if there is enough inventory (1 to 1)" do + rental = Rental.new(@good_rental) + rental.valid?.must_equal true end it "wont validate a rental if there is not enough inventory" do - rental = Rental.new(@rental_data) + rental = Rental.new(@bad_rental) rental.valid?.must_equal false rental.errors.messages.must_include :movie_id end From f15ff3d1494c80e951dbdc71dfa9bf72b8aecf40 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 14:31:36 -0700 Subject: [PATCH 59/65] added edge case inventory validation test --- test/models/rental_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 7d119d408..1f58d3bb4 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -76,7 +76,8 @@ customer_id: @customer.id, movie_id: movies(:movie_one_copy).id, check_out_date: Date.today, - due_date: Date.today + 3 + due_date: Date.today + 3, + status: "checked out" } end From 7888bd51e8807862a7c3faff989e148c46ae938c Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 14:36:56 -0700 Subject: [PATCH 60/65] cleaning up rental validations tests --- test/models/rental_test.rb | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1f58d3bb4..f1a0ac1b1 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -62,32 +62,23 @@ # does this need its own describ block describe 'check_inventory' do before do - # @movie_not_available = movies(:movie_not_available) - @customer = customers(:good_customer2) - @bad_rental = { - customer_id: @customer.id, - movie_id: movies(:movie_not_available).id, - check_out_date: Date.today, - due_date: Date.today + 3 - } - - # @movie_one_copy = movies(:movie_one_copy) - @good_rental = { - customer_id: @customer.id, - movie_id: movies(:movie_one_copy).id, + @rental_info = { + customer_id: customers(:good_customer2), check_out_date: Date.today, due_date: Date.today + 3, status: "checked out" } end - # edge case 1 in inventory - 1 available - it "will validate a rental if there is enough inventory (1 to 1)" do - rental = Rental.new(@good_rental) + # edge case 1 inventory - 1 available + it "will validate a rental if there is enough inventory" do + @rental_info[movie_id:] = movies(:movie_one_copy).id, + rental = Rental.new(@rental_info) rental.valid?.must_equal true end it "wont validate a rental if there is not enough inventory" do + @rental_info[:movie_id] = movies(:movie_not_available).id rental = Rental.new(@bad_rental) rental.valid?.must_equal false rental.errors.messages.must_include :movie_id From 6947be11ff243ca604d466b553291533aebe0bc7 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 15:12:37 -0700 Subject: [PATCH 61/65] cleaned up model files create_rental method --- app/models/customer.rb | 10 ++++------ app/models/movie.rb | 6 ++++++ app/models/rental.rb | 10 ++++++---- test/models/movie_test.rb | 4 +++- test/models/rental_test.rb | 12 ++++++++---- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index d607a80de..f36b2fef0 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,17 +2,15 @@ class Customer < ApplicationRecord has_many :rentals validates :name, presence: true - validates :registered_at,presence: true - validates :address, presence: true, length: {minimum: 3} - validates :city,presence: true, format: { with: /\A[a-zA-Z]+\z/ } - validates :state,presence: true, format: { with: /\A[a-zA-Z]+\z/} - validates :postal_code,presence: true, numericality: true, length: { is: 5 } - validates :phone,presence: true, format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}\z/ } + def increase_checkout_count + self.movies_checked_out_count += 1 + self.save if self.valid? + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 8e49175e0..1f6fd92cc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,8 +1,14 @@ class Movie < ApplicationRecord has_many :rentals + validates :title, presence: true, uniqueness: true validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { greater_than: -1 } validates :available_inventory, presence: true, numericality: { greater_than: -1 } + + def decrease_inventory + self.available_inventory -= 1 + self.save if self.valid? + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index bc14eeaa1..e52c8350a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,6 +2,7 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + validates :check_out_date, presence: true validates :due_date, presence: true validates :status, inclusion: { in: [ "checked out", "checked in", "overdue" ] } @@ -19,7 +20,9 @@ def self.create_rental(info) rental.check_out_date = Date.today rental.due_date = Date.today + 3 rental.status = "checked out" - # rental.manage_inventory + rental.movie.decrease_inventory + # would it be better to know customer exists before this method? + rental.customer.increase_checkout_count if rental.customer rental.valid? # can add validation to check inventory return rental end @@ -37,13 +40,12 @@ def self.overdue_movies return array_of_overdues end -private - def check_inventory movie = self.movie - # movie = Movie.find_by(:id rental.movie_id) if movie.nil? || movie.available_inventory == 0 || movie.available_inventory.nil? errors.add(:movie_id, "no available inventory") end end + + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index b6ade3989..526eee056 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -7,7 +7,9 @@ @input = { title: "Harry Potter", overview: "Boy learns he is a wizard", release_date: "11-23-2001", - inventory: 10 + inventory: 10, + available_inventory: 10 + } end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index f1a0ac1b1..6e8e1ce39 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -62,18 +62,22 @@ # does this need its own describ block describe 'check_inventory' do before do + @movie_one_copy = movies(:movie_one_copy).id @rental_info = { - customer_id: customers(:good_customer2), + movie_id: nil, + customer_id: customers(:good_customer2).id, check_out_date: Date.today, due_date: Date.today + 3, status: "checked out" } end - # edge case 1 inventory - 1 available + # edge case 1 inventory and 1 available it "will validate a rental if there is enough inventory" do - @rental_info[movie_id:] = movies(:movie_one_copy).id, + @rental_info[:movie_id] = @movie_one_copy rental = Rental.new(@rental_info) + rental.valid? + # p rental.errors rental.valid?.must_equal true end @@ -81,7 +85,7 @@ @rental_info[:movie_id] = movies(:movie_not_available).id rental = Rental.new(@bad_rental) rental.valid?.must_equal false - rental.errors.messages.must_include :movie_id + rental.errors.messages[:movie_id][0].must_equal "no available inventory" end end end From a993420d5c512c5c94742ca7caefe5cf571a8269 Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Fri, 12 May 2017 15:12:50 -0700 Subject: [PATCH 62/65] added tests for update and creTE --- test/controllers/rentals_controller_test.rb | 16 +++++++++++++--- test/models/rental_test.rb | 12 ++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 57eff9bce..2b596a8cb 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -72,11 +72,10 @@ movies_count_before = @customer.movies_checked_out_count inventory_count_before = movie.available_inventory post create_rental_path(movie.title), params: { rental: rental_data } - movie.reload inventory_count_after = movie.available_inventory - movies_count_after= @customer.movies_checked_out_count + movies_count_after = @customer.movies_checked_out_count (inventory_count_after - inventory_count_before).must_equal 0 - (movies_count_after - inventory_count_before).must_equal 0 + (movies_count_before - movies_count_after).must_equal 0 end @@ -136,6 +135,8 @@ post create_rental_path(@movie.title), params: { rental: @rental_data } rental_id = response.parsed_body["rental_id"] @rental = Rental.find_by(id: rental_id) + @bad_customer_id = Customer.all.last.id + 1 + @bad_rental_data = { customer_id: @bad_customer_id} end @@ -187,5 +188,14 @@ (count_before - count_after).must_equal -1 end + it 'does not updates available inventory if given bad data' do + movie = movies(:movie1) + count_before = movie.available_inventory + patch update_rental_path(movie.title), params: { rental: @bad_rental_data } + movie.reload + count_after = movie.available_inventory + (count_before - count_after).must_equal 0 + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1258a6fba..b452fc9ab 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -6,12 +6,12 @@ before do @customer_id = customers(:good_customer).id @rental_info = { - movie_id: movies(:movie3).id, - customer_id: @customer_id, - check_out_date: Date.today, - due_date: Date.today + 3, - status: "checked out" - } + movie_id: movies(:movie3).id, + customer_id: @customer_id, + check_out_date: Date.today, + due_date: Date.today + 3, + status: "checked out" + } end it "requires all attributes to create instance" do From 012f4300c364c6ca7b299762bd541a9096f9d1bd Mon Sep 17 00:00:00 2001 From: natalia-ku Date: Fri, 12 May 2017 15:14:26 -0700 Subject: [PATCH 63/65] commented out controller and tests --- app/controllers/rentals_controller.rb | 188 ++++----- test/controllers/rentals_controller_test.rb | 402 ++++++++++---------- 2 files changed, 295 insertions(+), 295 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8f031c97e..abb19f3e0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,94 +1,94 @@ -class RentalsController < ApplicationController - - def create - movie = Movie.find_by(title: params[:title]) - if movie - rental_info = { customer_id: params["rental"]["customer_id"], - movie_id: movie.id - } - if Customer.find_by(id: params["rental"]["customer_id"]) != nil - if Rental.where(status: "checked out", movie_id: movie.id, - customer_id: params["rental"]["customer_id"]).length > 0 - render status: :bad_request, json: { error: "Customer already checked out this movie."} - else - rental = Rental.create_rental(rental_info) - set_up_available_inventory(rental, movie) - if rental.movie.available_inventory > 0 - rental.movie.available_inventory -= 1 - rental.movie.save - rental.customer.movies_checked_out_count += 1 - rental.customer.save - if rental.save - render status: :ok, json: { rental_id: rental.id } - else - render status: :bad_request, json: { errors: rental.errors.messages } - end - else - render status: :bad_request, json: { error: "Movie is not available for checkout. Available inventory = 0"} - end - end - else - render status: :bad_request, json: { error: "Customer with id #{params["rental"]["customer_id"]} does not exist"} - end - else - render status: :bad_request, json: { errors: "Movie does not exist" } - end - end - - - - - def update - # make sure that user cannot check in movie he/she did not checked out: - movie = Movie.find_by(title: params[:title]) - if movie - if Rental.where(status: "checked out", movie_id: movie.id, - customer_id: params["rental"]["customer_id"]).length == 0 - render status: :bad_request, json: { error: "You cannot check in movie, that you did not checked out "} - else - rental = Rental.find_by(movie_id: movie.id, customer_id: params["rental"]["customer_id"]) - if rental.status == "checked in" - render status: :ok, json: { error: "Movie is already checked in" } - else - rental.return_date = Date.today - rental.status = "checked in" - rental.customer.movies_checked_out_count -= 1 - rental.customer.save - rental.movie.available_inventory += 1 - rental.movie.save - if rental.save - render status: :ok, json: { status: rental.status } - else - render status: :bad_request, json: { errors: rental.errors.messages } - end - end - end - else - render status: :bad_request, json: { errors: "movie does not exist" } - end - end - - - def overdue_rentals - overdue_rentals = Rental.overdue_movies - if overdue_rentals.empty? - render json: { message: "No overdue rentals was found" }, status: :ok - else - render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok - end - end - - private - - def set_up_available_inventory(rental, movie) - if Rental.where(movie_id: movie.id, status: "checked out").length == 0 - rental.movie.available_inventory = rental.movie.inventory - rental.movie.save - end - end - def rental_params - params.require(:rental).permit(:customer_id, :title, :check_out_date, - :return_date, :due_date, :status) - end - -end +# class RentalsController < ApplicationController +# +# def create +# movie = Movie.find_by(title: params[:title]) +# if movie +# rental_info = { customer_id: params["rental"]["customer_id"], +# movie_id: movie.id +# } +# if Customer.find_by(id: params["rental"]["customer_id"]) != nil +# if Rental.where(status: "checked out", movie_id: movie.id, +# customer_id: params["rental"]["customer_id"]).length > 0 +# render status: :bad_request, json: { error: "Customer already checked out this movie."} +# else +# rental = Rental.create_rental(rental_info) +# set_up_available_inventory(rental, movie) +# if rental.movie.available_inventory > 0 +# rental.movie.available_inventory -= 1 +# rental.movie.save +# rental.customer.movies_checked_out_count += 1 +# rental.customer.save +# if rental.save +# render status: :ok, json: { rental_id: rental.id } +# else +# render status: :bad_request, json: { errors: rental.errors.messages } +# end +# else +# render status: :bad_request, json: { error: "Movie is not available for checkout. Available inventory = 0"} +# end +# end +# else +# render status: :bad_request, json: { error: "Customer with id #{params["rental"]["customer_id"]} does not exist"} +# end +# else +# render status: :bad_request, json: { errors: "Movie does not exist" } +# end +# end +# +# +# +# +# def update +# # make sure that user cannot check in movie he/she did not checked out: +# movie = Movie.find_by(title: params[:title]) +# if movie +# if Rental.where(status: "checked out", movie_id: movie.id, +# customer_id: params["rental"]["customer_id"]).length == 0 +# render status: :bad_request, json: { error: "You cannot check in movie, that you did not checked out "} +# else +# rental = Rental.find_by(movie_id: movie.id, customer_id: params["rental"]["customer_id"]) +# if rental.status == "checked in" +# render status: :ok, json: { error: "Movie is already checked in" } +# else +# rental.return_date = Date.today +# rental.status = "checked in" +# rental.customer.movies_checked_out_count -= 1 +# rental.customer.save +# rental.movie.available_inventory += 1 +# rental.movie.save +# if rental.save +# render status: :ok, json: { status: rental.status } +# else +# render status: :bad_request, json: { errors: rental.errors.messages } +# end +# end +# end +# else +# render status: :bad_request, json: { errors: "movie does not exist" } +# end +# end +# +# +# def overdue_rentals +# overdue_rentals = Rental.overdue_movies +# if overdue_rentals.empty? +# render json: { message: "No overdue rentals was found" }, status: :ok +# else +# render json: overdue_rentals, each_serializer: OverdueListSerializer, status: :ok +# end +# end +# +# private +# +# def set_up_available_inventory(rental, movie) +# if Rental.where(movie_id: movie.id, status: "checked out").length == 0 +# rental.movie.available_inventory = rental.movie.inventory +# rental.movie.save +# end +# end +# def rental_params +# params.require(:rental).permit(:customer_id, :title, :check_out_date, +# :return_date, :due_date, :status) +# end +# +# end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 2b596a8cb..030281bc9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,201 +1,201 @@ -require "test_helper" -require 'date' -describe RentalsController do - - describe 'create' do - before do - @bad_customer_id = Customer.all.last.id + 1 - @customer = customers(:good_customer2) - @movie = movies(:movie3) - end - - let(:rental_data) { { customer_id: @customer.id } } - - it 'creates a new rental' do - post create_rental_path(movies(:movie3).title), params: { rental: rental_data } - must_respond_with :success - response.parsed_body.must_include "rental_id" - Rental.find(response.parsed_body["rental_id"]).movie_id.must_equal @movie.id - Rental.find(response.parsed_body["rental_id"]).customer_id.must_equal @customer.id - end - - it 'wont create a rental if customer already has that movie checked out' do - post create_rental_path(@movie.title), params: { rental: rental_data } - must_respond_with :success - post create_rental_path(@movie.title), params: { rental: rental_data } - must_respond_with :bad_request - response.parsed_body.must_include "error" - end - - it 'allows a customre to checkout out a movie again, if repeat rentals status is checked in' do - post create_rental_path(@movie.title), params: { rental: rental_data } - must_respond_with :success - patch update_rental_path(@movie.title), params: { rental: rental_data } - must_respond_with :success - post create_rental_path(@movie.title), params: { rental: rental_data } - must_respond_with :success - # repeat_rentals = @customer.rentals.where(movie_id: @movie.id) - # repeat_rentals.each {|rental| rental.} - end - - it 'returns bad request if given customer id DNE' do - post create_rental_path(@movie.title), params: { rental: { customer_id: @bad_customer_id } } - must_respond_with :bad_request - response.parsed_body.must_include "error" - end - - it 'returns bad request if given movie title DNE' do - post create_rental_path("Harry Potter"), params: { rental: rental_data } - must_respond_with :bad_request - response.parsed_body.must_include "errors" - end - - it 'updates movie checkout count for customer' do - count_before = @customer.movies_checked_out_count - post create_rental_path(movies(:movie5).title), params: { rental: rental_data } - @customer.reload - count_after = @customer.movies_checked_out_count - (count_after - count_before).must_equal 1 - end - - it 'updates available inventory' do - movie = movies(:movie5) - inventory_count_before = movie.available_inventory - post create_rental_path(movie.title), params: { rental: rental_data } - movie.reload - inventory_count_after = movie.available_inventory - (inventory_count_after - inventory_count_before).must_equal -1 - end - - it 'does not update available inventory and movie checkout count if available inventory is 0' do - movie = movies(:movie4) - movies_count_before = @customer.movies_checked_out_count - inventory_count_before = movie.available_inventory - post create_rental_path(movie.title), params: { rental: rental_data } - inventory_count_after = movie.available_inventory - movies_count_after = @customer.movies_checked_out_count - (inventory_count_after - inventory_count_before).must_equal 0 - (movies_count_before - movies_count_after).must_equal 0 - end - - - end - - describe "overdue_rentals" do - - it 'is a real working api route' do - get overdue_rentals_path - must_respond_with :success - end - - it 'returns json' do - get overdue_rentals_path - response.header['Content-Type'].must_include 'json' - end - - it 'returns an array of hashes' do - # skip - get overdue_rentals_path - response.parsed_body.must_be_instance_of Array - response.parsed_body.each do |overdue_rentals_hash| - overdue_rentals_hash.must_be_instance_of Hash - end - end - - it 'returns the correct amount of overdue rentals' do - get overdue_rentals_path - overdue_rentals = Rental.where(status: "overdue") - response.parsed_body.length.must_equal overdue_rentals.length - end - - it 'returns overdue rentals with the expected fields' do - keys = %w( check_out_date customer_id due_date name postal_code title ) - get overdue_rentals_path - response.parsed_body.each do |rental| - rental.keys.sort.must_equal keys - end - end - - it 'returns json message if there are no overdue movies' do - Rental.destroy_all - get overdue_rentals_path - # learning note: status will return the HTTP status code - # response.status.must_equal 200 - # learning note: must_respond_with lets you test to the HTTP status message - must_respond_with :success - response.parsed_body.must_include "message" - end - end - - describe "update" do - before do - customer = customers(:good_customer) - @rental_data = { "customer_id": customer.id } - @movie = movies(:movie5) - post create_rental_path(@movie.title), params: { rental: @rental_data } - rental_id = response.parsed_body["rental_id"] - @rental = Rental.find_by(id: rental_id) - @bad_customer_id = Customer.all.last.id + 1 - @bad_rental_data = { customer_id: @bad_customer_id} - - end - - it "a working api route" do - patch update_rental_path(@movie.title), params: { rental: @rental_data } - must_respond_with :success - end - - it 'returns json' do - patch update_rental_path(@movie.title), params: { rental: @rental_data } - response.header['Content-Type'].must_include 'json' - end - - it "changes rental status" do - patch update_rental_path(@movie.title), params: { rental: @rental_data } - response.parsed_body.must_include "status" - rental = Rental.find(@rental.id) - rental.status.must_equal "checked in" - end - - it "changes movies checkout count" do - count_before = @rental.customer.movies_checked_out_count - patch update_rental_path(@movie.title), params: { rental: @rental_data } - @rental.reload - count_after = @rental.customer.movies_checked_out_count - (count_before - count_after).must_equal 1 - end - - it "returns bad request status if movie for rental is not found " do - patch update_rental_path("Movie that DNE"), params: { rental: @rental_data } - must_respond_with :bad_request - response.parsed_body.must_include "errors" - end - - it "does not allow to check in movie if user didn't checkout this movie " do - customer = customers(:good_customer4) - rental_data = { "customer_id": customer.id } - patch update_rental_path(@movie.title), params: { rental: rental_data } - must_respond_with :bad_request - response.parsed_body.must_include "error" - end - - it 'updates available inventory' do - movie = movies(:movie1) - count_before = movie.available_inventory - patch update_rental_path(movie.title), params: { rental: @rental_data } - movie.reload - count_after = movie.available_inventory - (count_before - count_after).must_equal -1 - end - - it 'does not updates available inventory if given bad data' do - movie = movies(:movie1) - count_before = movie.available_inventory - patch update_rental_path(movie.title), params: { rental: @bad_rental_data } - movie.reload - count_after = movie.available_inventory - (count_before - count_after).must_equal 0 - end - - end -end +# require "test_helper" +# require 'date' +# describe RentalsController do +# +# describe 'create' do +# before do +# @bad_customer_id = Customer.all.last.id + 1 +# @customer = customers(:good_customer2) +# @movie = movies(:movie3) +# end +# +# let(:rental_data) { { customer_id: @customer.id } } +# +# it 'creates a new rental' do +# post create_rental_path(movies(:movie3).title), params: { rental: rental_data } +# must_respond_with :success +# response.parsed_body.must_include "rental_id" +# Rental.find(response.parsed_body["rental_id"]).movie_id.must_equal @movie.id +# Rental.find(response.parsed_body["rental_id"]).customer_id.must_equal @customer.id +# end +# +# it 'wont create a rental if customer already has that movie checked out' do +# post create_rental_path(@movie.title), params: { rental: rental_data } +# must_respond_with :success +# post create_rental_path(@movie.title), params: { rental: rental_data } +# must_respond_with :bad_request +# response.parsed_body.must_include "error" +# end +# +# it 'allows a customre to checkout out a movie again, if repeat rentals status is checked in' do +# post create_rental_path(@movie.title), params: { rental: rental_data } +# must_respond_with :success +# patch update_rental_path(@movie.title), params: { rental: rental_data } +# must_respond_with :success +# post create_rental_path(@movie.title), params: { rental: rental_data } +# must_respond_with :success +# # repeat_rentals = @customer.rentals.where(movie_id: @movie.id) +# # repeat_rentals.each {|rental| rental.} +# end +# +# it 'returns bad request if given customer id DNE' do +# post create_rental_path(@movie.title), params: { rental: { customer_id: @bad_customer_id } } +# must_respond_with :bad_request +# response.parsed_body.must_include "error" +# end +# +# it 'returns bad request if given movie title DNE' do +# post create_rental_path("Harry Potter"), params: { rental: rental_data } +# must_respond_with :bad_request +# response.parsed_body.must_include "errors" +# end +# +# it 'updates movie checkout count for customer' do +# count_before = @customer.movies_checked_out_count +# post create_rental_path(movies(:movie5).title), params: { rental: rental_data } +# @customer.reload +# count_after = @customer.movies_checked_out_count +# (count_after - count_before).must_equal 1 +# end +# +# it 'updates available inventory' do +# movie = movies(:movie5) +# inventory_count_before = movie.available_inventory +# post create_rental_path(movie.title), params: { rental: rental_data } +# movie.reload +# inventory_count_after = movie.available_inventory +# (inventory_count_after - inventory_count_before).must_equal -1 +# end +# +# it 'does not update available inventory and movie checkout count if available inventory is 0' do +# movie = movies(:movie4) +# movies_count_before = @customer.movies_checked_out_count +# inventory_count_before = movie.available_inventory +# post create_rental_path(movie.title), params: { rental: rental_data } +# inventory_count_after = movie.available_inventory +# movies_count_after = @customer.movies_checked_out_count +# (inventory_count_after - inventory_count_before).must_equal 0 +# (movies_count_before - movies_count_after).must_equal 0 +# end +# +# +# end +# +# describe "overdue_rentals" do +# +# it 'is a real working api route' do +# get overdue_rentals_path +# must_respond_with :success +# end +# +# it 'returns json' do +# get overdue_rentals_path +# response.header['Content-Type'].must_include 'json' +# end +# +# it 'returns an array of hashes' do +# # skip +# get overdue_rentals_path +# response.parsed_body.must_be_instance_of Array +# response.parsed_body.each do |overdue_rentals_hash| +# overdue_rentals_hash.must_be_instance_of Hash +# end +# end +# +# it 'returns the correct amount of overdue rentals' do +# get overdue_rentals_path +# overdue_rentals = Rental.where(status: "overdue") +# response.parsed_body.length.must_equal overdue_rentals.length +# end +# +# it 'returns overdue rentals with the expected fields' do +# keys = %w( check_out_date customer_id due_date name postal_code title ) +# get overdue_rentals_path +# response.parsed_body.each do |rental| +# rental.keys.sort.must_equal keys +# end +# end +# +# it 'returns json message if there are no overdue movies' do +# Rental.destroy_all +# get overdue_rentals_path +# # learning note: status will return the HTTP status code +# # response.status.must_equal 200 +# # learning note: must_respond_with lets you test to the HTTP status message +# must_respond_with :success +# response.parsed_body.must_include "message" +# end +# end +# +# describe "update" do +# before do +# customer = customers(:good_customer) +# @rental_data = { "customer_id": customer.id } +# @movie = movies(:movie5) +# post create_rental_path(@movie.title), params: { rental: @rental_data } +# rental_id = response.parsed_body["rental_id"] +# @rental = Rental.find_by(id: rental_id) +# @bad_customer_id = Customer.all.last.id + 1 +# @bad_rental_data = { customer_id: @bad_customer_id} +# +# end +# +# it "a working api route" do +# patch update_rental_path(@movie.title), params: { rental: @rental_data } +# must_respond_with :success +# end +# +# it 'returns json' do +# patch update_rental_path(@movie.title), params: { rental: @rental_data } +# response.header['Content-Type'].must_include 'json' +# end +# +# it "changes rental status" do +# patch update_rental_path(@movie.title), params: { rental: @rental_data } +# response.parsed_body.must_include "status" +# rental = Rental.find(@rental.id) +# rental.status.must_equal "checked in" +# end +# +# it "changes movies checkout count" do +# count_before = @rental.customer.movies_checked_out_count +# patch update_rental_path(@movie.title), params: { rental: @rental_data } +# @rental.reload +# count_after = @rental.customer.movies_checked_out_count +# (count_before - count_after).must_equal 1 +# end +# +# it "returns bad request status if movie for rental is not found " do +# patch update_rental_path("Movie that DNE"), params: { rental: @rental_data } +# must_respond_with :bad_request +# response.parsed_body.must_include "errors" +# end +# +# it "does not allow to check in movie if user didn't checkout this movie " do +# customer = customers(:good_customer4) +# rental_data = { "customer_id": customer.id } +# patch update_rental_path(@movie.title), params: { rental: rental_data } +# must_respond_with :bad_request +# response.parsed_body.must_include "error" +# end +# +# it 'updates available inventory' do +# movie = movies(:movie1) +# count_before = movie.available_inventory +# patch update_rental_path(movie.title), params: { rental: @rental_data } +# movie.reload +# count_after = movie.available_inventory +# (count_before - count_after).must_equal -1 +# end +# +# it 'does not updates available inventory if given bad data' do +# movie = movies(:movie1) +# count_before = movie.available_inventory +# patch update_rental_path(movie.title), params: { rental: @bad_rental_data } +# movie.reload +# count_after = movie.available_inventory +# (count_before - count_after).must_equal 0 +# end +# +# end +# end From 0cb37b0b7155d9ebf98c799c789aadc180b1a806 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 15:48:05 -0700 Subject: [PATCH 64/65] final clean up of files --- app/controllers/customers_controller.rb | 13 ----- app/controllers/rentals_controller.rb | 62 +++++---------------- app/models/rental.rb | 5 +- app/serializers/movie_serializer.rb | 20 +------ test/controllers/rentals_controller_test.rb | 7 +-- 5 files changed, 17 insertions(+), 90 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5706e707b..130f5da01 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -8,17 +8,4 @@ def index render json: customers, status: :ok end end - - def show - customer = Customer.find_by(id: params[:id]) - if customer == nil - render status: :not_found, json: { - "errors": { "id": ["Customer #{params[:id]} not found"]} - } - else - render json: customer, status: :ok - end - end - - end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8c8543648..6fc38d80b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,55 +1,18 @@ - -# class RentalsController < ApplicationController -# -# def create -# movie = Movie.find_by(title: params[:title]) -# if movie -# rental_info = { customer_id: params["rental"]["customer_id"], -# movie_id: movie.id -# } -# if Customer.find_by(id: params["rental"]["customer_id"]) != nil -# if Rental.where(status: "checked out", movie_id: movie.id, -# customer_id: params["rental"]["customer_id"]).length > 0 -# render status: :bad_request, json: { error: "Customer already checked out this movie."} -# else -# rental = Rental.create_rental(rental_info) -# set_up_available_inventory(rental, movie) -# if rental.movie.available_inventory > 0 -# rental.movie.available_inventory -= 1 -# rental.movie.save -# rental.customer.movies_checked_out_count += 1 -# rental.customer.save -# if rental.save -# render status: :ok, json: { rental_id: rental.id } -# else -# render status: :bad_request, json: { errors: rental.errors.messages } -# end -# else -# render status: :bad_request, json: { error: "Movie is not available for checkout. Available inventory = 0"} -# end -# end -# else -# render status: :bad_request, json: { error: "Customer with id #{params["rental"]["customer_id"]} does not exist"} -# end -# else -# render status: :bad_request, json: { errors: "Movie does not exist" } -# end -# end -# -# - class RentalsController < ApplicationController + + # example of params: {"rental"=>{ "customer_id"=>1 }, "title"=>"Psycho"} def create - # example of params - # {"rental"=>{ "customer_id"=>1 }, "title"=>"Psycho"} movie = Movie.find_by(title: params[:title]) - if movie - rental_info = { customer_id: params["rental"]["customer_id"], - movie_id: movie.id - } + customer = Customer.find_by(id: params["rental"]["customer_id"]) + + if !movie.nil? && !customer.nil? + rental_info = { customer_id: customer.id, + movie_id: movie.id + } if Rental.where(status: "checked out", - movie_id: movie.id, - customer_id: params["rental"]["customer_id"]).length > 0 + movie_id: movie.id, + customer_id: params["rental"]["customer_id"]).length > 0 + render status: :bad_request, json: { error: "Customer has this movie currently checked out" } else rental = Rental.create_rental(rental_info) @@ -60,8 +23,9 @@ def create render status: :bad_request, json: { errors: rental.errors.messages } end end + else - render status: :bad_request, json: { errors: "movie does not exist" } + render status: :bad_request, json: { errors: "movie and/or customer does not exist" } end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 112c93055..3ca9f23f7 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -20,9 +20,8 @@ def self.create_rental(info) rental.due_date = Date.today + 3 rental.status = "checked out" rental.movie.decrease_inventory - # would it be better to know customer exists before this method? - rental.customer.increase_checkout_count if rental.customer - rental.valid? # can add validation to check inventory + rental.customer.increase_checkout_count + rental.valid? return rental end diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb index b53826bd2..656643cdf 100644 --- a/app/serializers/movie_serializer.rb +++ b/app/serializers/movie_serializer.rb @@ -1,21 +1,3 @@ class MovieSerializer < ActiveModel::Serializer - attributes :title, :overview, :release_date, :inventory, :available_inventory - - - def available_inventory - if object.available_inventory == 0 && no_rentals?(object) - return object.inventory - else - return object.available_inventory - end - end - - def no_rentals?(object) - object.rentals.each do |rental| - return false if rental.status == "checked out" - end - return true - end - - + attributes :title, :overview, :release_date, :inventory, :available_inventory end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b60c4f4d7..e8cffd9dd 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -27,15 +27,13 @@ response.parsed_body.must_include "error" end - it 'allows a customre to checkout out a movie again, if repeat rentals status is checked in' do + it 'allows a customer to checkout out a movie again, as long as all past rentals, same movie, have status checked in' do post create_rental_path(@movie.title), params: { rental: rental_data } must_respond_with :success patch update_rental_path(@movie.title), params: { rental: rental_data } must_respond_with :success post create_rental_path(@movie.title), params: { rental: rental_data } must_respond_with :success - # repeat_rentals = @customer.rentals.where(movie_id: @movie.id) - # repeat_rentals.each {|rental| rental.} end it 'returns bad request if given customer id DNE' do @@ -77,8 +75,6 @@ (inventory_count_after - inventory_count_before).must_equal 0 (movies_count_before - movies_count_after).must_equal 0 end - - end describe "overdue_rentals" do @@ -196,6 +192,5 @@ count_after = movie.available_inventory (count_before - count_after).must_equal 0 end - end end From b82c077342d33ac7c3aa05d0a2946cae8aa64603 Mon Sep 17 00:00:00 2001 From: Cynthia Cobb Date: Fri, 12 May 2017 16:01:22 -0700 Subject: [PATCH 65/65] more spacing cleanuo --- app/models/customer.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index f36b2fef0..db49f49be 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,16 +1,16 @@ class Customer < ApplicationRecord has_many :rentals - + validates :name, presence: true - validates :registered_at,presence: true + validates :registered_at, presence: true validates :address, presence: true, length: {minimum: 3} - validates :city,presence: true, format: { with: /\A[a-zA-Z]+\z/ } - validates :state,presence: true, format: { with: /\A[a-zA-Z]+\z/} - validates :postal_code,presence: true, numericality: true, length: { is: 5 } - validates :phone,presence: true, format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}\z/ } + validates :city, presence: true, format: { with: /\A[a-zA-Z]+\z/ } + validates :state, presence: true, format: { with: /\A[a-zA-Z]+\z/} + validates :postal_code, presence: true, numericality: true, length: { is: 5 } + validates :phone, presence: true, format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}\z/ } def increase_checkout_count self.movies_checked_out_count += 1 - self.save if self.valid? + self.save end end