From e3e53a95bbb5a854d2cb34a3306130d37e738c2f Mon Sep 17 00:00:00 2001 From: Jansen Date: Tue, 14 May 2019 13:55:09 -0700 Subject: [PATCH 01/32] Initialize rails project; Add movie model --- .gitignore | 23 ++ .ruby-version | 1 + Gemfile | 54 +++ Gemfile.lock | 169 ++++++++++ Guardfile | 9 + README.md | 313 +----------------- Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/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 | 33 ++ bin/spring | 17 + bin/update | 28 ++ config.ru | 5 + config/application.rb | 41 +++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++ config/environment.rb | 5 + config/environments/development.rb | 54 +++ config/environments/production.rb | 85 +++++ config/environments/test.rb | 46 +++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 ++ config/puma.rb | 34 ++ config/routes.rb | 11 + config/spring.rb | 6 + config/storage.yml | 34 ++ db/migrate/20190514205343_create_movies.rb | 12 + db/schema.rb | 27 ++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 13 + test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/movie_test.rb | 9 + test/test_helper.rb | 24 ++ tmp/.keep | 0 vendor/.keep | 0 64 files changed, 1019 insertions(+), 300 deletions(-) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/models/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/credentials.yml.enc 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/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/migrate/20190514205343_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 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep 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/movie_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# 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 uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..87d307d81 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.17.3 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/README.md b/README.md index 5a23d9ab8..7db80e4ca 100644 --- a/README.md +++ b/README.md @@ -1,311 +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: -This project is due: **Friday May 17th** +* Ruby version -## Learning Goals -Upon completing this project, students should be able to: +* System dependencies -- 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 +* Configuration -This is a [stage 2](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) project. +* Database creation -## Success Criteria -Your project will be evaluated against the following requirements: +* Database initialization -- API conformity - - The provided smoke tests should pass (see the subfolder) - - Bad data sent to the API should result in an appropriate status code and helpful error -- Test coverage - - Models: All relations, validations, and custom model methods should include at least one positive and one negative test case - - Controllers: Every API endpoint should include at least one positive and one negative test case -- Style and Organization - - Everything we've learned so far about how to design and build a Rails app still applies! +* How to run the test suite -## 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!" +* Services (job queues, cache servers, search engines, etc.) -## 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 +* Deployment instructions -In the past, many students have spent lots of time writing and testing validations for these models. Because project time is limited and validations are not an important learning objective this week, we do not recommend this. Instead, validate only those fields that, if they are absent, will break your API. - -### Seed Data -`movies.json` contains information about the videos available to rent at the store. The data is presented as an array of objects, with each object having the following key-value pairs: - -| Field | Datatype | Description -|----------------|----------|------------ -| `title` | string | The title of the film -| `overview` | string | A short plot synopsis -| `release_date` | date | `YYYY-MM-DD`, Day the film was originally released -| `inventory` | integer | How many copies of the film the video store owns - -`customers.json` contains information about the customers that have rented with the store in the past. The data is presented as, you guessed it, an array of objects, with each object have the following key-value pairs: - -| Field | Datatype | Description -|------------------|----------|------------ -| `name` | string | The customer's name -| `registered_at` | datetime | `Wed, 29 Apr 2015 07:54:14 -0700`, When the customer first visited the store -| `address` | string | Street address -| `city` | string |   -| `state` | string |   -| `postal_code` | string |   -| `phone` | string | Primary contact phone number - -### Testing -As with all Rails projects, model testing is a requirement. You should have _at least_ one positive and one negative test case for each relation, validation, and custom function you add to your models. - -Use good TDD practices, and test _before_ you code. Remember: red-green-refactor. - -## Waves 2 and 3: Coding The API -In this wave, you will implement the API described below. The endpoints are described more-or-less in order of complexity, and we recommend you build them in that order. Every endpoint must serve JSON data, and must use HTTP response codes to indicate the status of the request. - -The schema of your database and the structure of your rails app are completely up to you, so long as the API conforms to the description and provided script. - -### Error Handling -If something goes wrong, your API should return an appropriate [HTTP status code](http://billpatrianakos.me/blog/2013/10/13/list-of-rails-status-code-symbols/), as well as a list of errors. The list should be formatted like this: - -```json -{ - "errors": { - "title": ["Movie 'Revenge of the Gnomes' not found"] - } -} -``` - -All errors your API can return should be covered by at least one test case. - -### Testing -Because APIs are often open to the public, thorough testing is essential. For a Rails API, that means controller testing. - -For each API endpoint, you should have _at least_: -- A basic test with no parameters, if applicable -- Positive and negative tests for any URI parameters (user ID, movie title) -- Testing around any data in the request body - -Use good TDD practices, and test _before_ you code. Remember: red-green-refactor. - -#### Smoke Tests -Because this API will be used as the backend for a future project, there are strict requirements about how it should be structured. To this end, we have provided a set of [smoke tests](http://softwaretestingfundamentals.com/smoke-testing/) written in Postman to exercise all the endpoints. - -The smoke tests will verify that your API looks correct to the outside world, by sending actual HTTP requests to your running server and checking the results. They test things like: - -- Did I get a success response for a valid request? -- Did the API return JSON? -- Does the JSON contain the expected property names? - -We have also included [this video](https://adaacademy.hosted.panopto.com/Panopto/Pages/Viewer.aspx?id=1324e06e-9767-49e4-85a0-a98c0122d69a) to show you how to run and use smoke tests. - -**The smoke tests are not a substitute for writing your own tests!!!!!** They do **not** check that the content is _correct_, nor do they cover any negative or edge cases. Verifying correctness in these cases is **your** responsibility. - -The smoke tests live in the file [`test/VideoStoreAPI_smoke_tests.postman_collection.json`](test/VideoStoreAPI_smoke_tests.postman_collection.json). To run them: - -1. Open Postman -1. Click `Import` in the top left -1. Drag-and-drop the file into the box -1. In the left sidebar, click on the `Collections` tab -1. There should now be an entry for the smoke tests. Hover over it and click the `>` icon for a detail view. You will notice they are in the format `{{url}}/movies`. `{{url}}` is a key which you can give a value on your computer. -1. To do so go to the Gearbox in the top-right and select `Manage Environments` -![Manage Environments](images/manage-environment.png) -1. Then Select `Add` -![add button](images/add-btn.png) -1. Lastly add a key `url` and value `http://localhost:3000` -![Key & Value](images/key-value.png) -1. Click the blue `Run` button. This will launch the collection runner. -1. In the collection runner, scroll down in the center pane and click the blue `Start Test` button - -## API Description - -### Wave 2: Customers and Movies - -#### `GET /customers` -List all customers - -Fields to return: -- `id` -- `name` -- `registered_at` -- `postal_code` -- `phone` -- `movies_checked_out_count` - - This will be 0 unless you've completed optional requirements - -#### `GET /movies` -List all movies - -Fields to return: -- `id` -- `title` -- `release_date` - -#### `GET /movies/:id` -Look a movie up by `id` - -URI parameters: -- `id`: Movie identifier - -Fields to return: -- `title` -- `overview` -- `release_date` -- `inventory` (total) -- `available_inventory` (not currently checked-out to a customer) - - This will be the same as `inventory` unless you've completed the optional endpoints. - -#### `POST /movies` -Create a new movie in the video store inventory. - -Upon success, this request should return the `id` of the movie created. - -Request body: - -| Field | Datatype | Description -|---------------|---------------------|------------ -| `title` | string | Title of the movie -| `overview` | string | Descriptive summary of the movie -| `release_date` | string `YYYY-MM-DD` | Date the movie was released -| `inventory` | integer | Quantity available in the video store - -### Wave 3: Rentals - -Wave 2 focused on working with customers and movies. With these endpoints you can extend the functionality of your API to allow managing the rental process. - -#### `POST /rentals/check-out` -Check out one of the movie's inventory to the customer. The rental's check-out date should be set to today, and the due date should be set to a week from today. - -**Note:** Some of the fields from wave 2 should now have interesting values. Good thing you wrote tests for them, right... right? - -Request body: - -| Field | Datatype | Description -|---------------|---------------------|------------ -| `customer_id` | integer | ID of the customer checking out this film -| `movie_id` | integer | ID of the movie to be checked out - -#### `POST /rentals/check-in` -Check in one of a customer's rentals - -Request body: - -| Field | Datatype | Description -|---------------|----------|------------ -| `customer_id` | integer | ID of the customer checking in this film -| `movie_id` | integer | ID of the movie to be checked in - -## Optional Enhancements -These really are **optional** - if you've gotten here and you have time left, that means you're moving speedy fast! - -### Query Parameters -Any endpoint that returns a list should accept 3 _optional_ [query parameters](http://guides.rubyonrails.org/action_controller_overview.html#parameters): - -| Name | Value | Description -|--------|---------|------------ -| `sort` | string | Sort objects by this field, in ascending order -| `n` | integer | Number of responses to return per page -| `p` | integer | Page of responses to return - -So, for an API endpoint like `GET /customers`, the following requests should be valid: -- `GET /customers`: All customers, sorted by ID -- `GET /customers?sort=name`: All customers, sorted by name -- `GET /customers?n=10&p=2`: Customers 11-20, sorted by ID -- `GET /customers?sort=name&n=10&p=2`: Customers 11-20, sorted by name - -Of course, adding new features means you should be adding new controller tests to verify them. - -Things to note: -- Sorting by ID is the rails default -- Possible sort fields: - - Customers can be sorted by `name`, `registered_at` and `postal_code` - - Movies can be sorted by `title` and `release_date` - - Overdue rentals can be sorted by `title`, `name`, `checkout_date` and `due_date` -- If the client requests both sorting and pagination, pagination should be relative to the sorted order -- Check out the [will_paginate gem](https://github.com/mislav/will_paginate) - -### More Endpoints: Inventory Management -All these endpoints should support all 3 query parameters. All fields are sortable. - -#### `GET /rentals/overdue` -List all customers with overdue movies - -Fields to return: -- `movie_id` -- `title` -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /movies/:id/current` -List customers that have _currently_ checked out a copy of the film - -URI parameters: -- `id`: Movie identifier - -Fields to return: -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /movies/:id/history` -List customers that have checked out a copy of the film _in the past_ - -URI parameters: -- `id`: Movie identifier - -Fields to return: -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /customers/:id/current` -List the movies a customer _currently_ has checked out - -URI parameters: -- `id`: Customer ID - -Fields to return: -- `title` -- `checkout_date` -- `due_date` - -#### `GET /customers/:id/history` -List the movies a customer has checked out _in the past_ - -URI parameters: -- `id`: Customer ID - -Fields to return: -- `title` -- `checkout_date` -- `due_date` - - -## Reference -- [Postman on Environments](https://www.getpostman.com/docs/environments) - -## What We're Looking For - -Check the [feedback template](./feedback.md) to see how we will evaluate your project. +* ... diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/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..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +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..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # 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..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..23d7e4fd8 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +tHsL546C39w0SNUih9hVW5lAPIJQNeVU6rX2xlqnS1cfjuL1qKLv2nQugqXPYq/rifpUzB9tCno+hmHCW9RpJLPprHu5zYRwNK+bmNNovK9bMECSXAx4YRe38zQKPyJT2fHU/Up004So6rbvNDgawo9g0JbUVdiGKSIshJM6MTBxxBLRwd9OR/kXV+xEjtzw9nBzRZjE1/J4zSOJDU3vEE6WwlkPMt0oZK+YhiefSktTSuYgTQhi3Nj49E2f63BNjE292FHbEGsElQtImpeEJpO+dhsRYpl+LPkYqnFkk3UNMJ93rUkz1B+4OZ6T/TKxKx3hkdR9JXjfbRuDaQK1G0Laj9rMCa73I1ogKXzB2X3lcevzwE91Qc8rYt+DQz5Y0dZV0UMNk1ckln1MlX7LNFgT4iYPMQ+3nolN--eSXQWyHKczbD03GG--q43GZ1E2zaSyVUaoICabUQ== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +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. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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 + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # 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..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +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 + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = 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 + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + 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/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# 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..fff6a38e4 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,11 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + # get /customers + # get /movies + # get /movies/:id <=== id + # post /movies + + # post /rentals/check-out <==== customer id, movie id + # post /rentals/check-in <==== customer id, movie id +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /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/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/migrate/20190514205343_create_movies.rb b/db/migrate/20190514205343_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514205343_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..6b6bd23af --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,27 @@ +# 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: 2019_05_14_205343) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e8afe187d --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/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..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 9be17a4b7b6fbd15df57ec95bace7382c7c3049e Mon Sep 17 00:00:00 2001 From: Jansen Date: Tue, 14 May 2019 13:56:40 -0700 Subject: [PATCH 02/32] Generate Movies controller and two actions --- app/controllers/movies_controller.rb | 7 +++++++ config/routes.rb | 2 ++ test/controllers/movies_controller_test.rb | 14 ++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..3d92a6d36 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,7 @@ +class MoviesController < ApplicationController + def index + end + + def zomg + end +end diff --git a/config/routes.rb b/config/routes.rb index fff6a38e4..6fb850e96 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do + get 'movies/index' + get 'movies/zomg' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html # get /customers diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..5df2b1757 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get zomg" do + get movies_zomg_url + value(response).must_be :success? + end + +end From 60af5a78a50015f2a663c678ae0d98edc323e6f1 Mon Sep 17 00:00:00 2001 From: Jansen Date: Tue, 14 May 2019 14:01:59 -0700 Subject: [PATCH 03/32] Generate model and controller for customers --- app/controllers/customers_controller.rb | 4 ++++ app/controllers/movies_controller.rb | 1 + app/models/customer.rb | 2 ++ config/routes.rb | 1 + db/migrate/20190514210019_create_customers.rb | 15 +++++++++++++++ db/schema.rb | 14 +++++++++++++- test/controllers/customers_controller_test.rb | 9 +++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/models/customer_test.rb | 9 +++++++++ 9 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20190514210019_create_customers.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/models/customer_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..73302240c --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3d92a6d36..57ceb01a5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,5 +3,6 @@ def index end def zomg + render json: { message: "It works!" } end end 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/config/routes.rb b/config/routes.rb index 6fb850e96..c45e83053 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + get 'customers/index' get 'movies/index' get 'movies/zomg' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/db/migrate/20190514210019_create_customers.rb b/db/migrate/20190514210019_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514210019_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 6b6bd23af..216257768 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,23 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_205343) do +ActiveRecord::Schema.define(version: 2019_05_14_210019) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "movies", force: :cascade do |t| t.string "title" t.string "overview" diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..c5ec6f20b --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..e791b2ee7 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2019-05-14 14:00:19 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 14:00:19 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end From 0097981750c8a78076532379051f66b6180efec4 Mon Sep 17 00:00:00 2001 From: Jansen Date: Tue, 14 May 2019 14:45:25 -0700 Subject: [PATCH 04/32] Add movie and customer fixtures; Add tests for existing validations --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + test/fixtures/customers.yml | 28 ++++++++++++++-------------- test/fixtures/movies.yml | 18 +++++++++--------- test/models/customer_test.rb | 7 ++++++- test/models/movie_test.rb | 7 ++++++- test/test_helper.rb | 4 ++-- 7 files changed, 39 insertions(+), 27 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..a62356cd9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + validates :name, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..d34b59f22 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + validates :title, presence: true end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index e791b2ee7..99ea32ef1 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +bob: + name: Bob McPhee registered_at: 2019-05-14 14:00:19 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: Bob's address + city: Seattle + state: WA + postal_code: 98100 + phone: 206-111-1111 -two: - name: MyString +sarah: + name: Sarah McPhee registered_at: 2019-05-14 14:00:19 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: Sarah's address + city: Seattle + state: WA + postal_code: 98100 + phone: 206-111-2222 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e8afe187d..651ef0a81 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: 2019-05-14 - inventory: 1 +blacksmith: + title: "Blacksmith Of The Banished" + overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life." + release_date: 1979-01-18 + inventory: 10 -two: - title: MyString - overview: MyString - release_date: 2019-05-14 +savior: + title: "Savior Of The Curse" + overview: "The strange woman claims the boy has a DNA strain..." + release_date: 2010-11-05 inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..b98e2b65f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,8 +2,13 @@ describe Customer do let(:customer) { Customer.new } + let(:valid_customer) { customers(:bob) } it "must be valid" do - value(customer).must_be :valid? + expect(valid_customer).must_be :valid? + end + + it "requires a name" do + expect(customer.valid?).must_equal false end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..e38522f6f 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,8 +2,13 @@ describe Movie do let(:movie) { Movie.new } + let(:valid_movie) { movies(:blacksmith) } it "must be valid" do - value(movie).must_be :valid? + expect(valid_movie.valid?).must_equal true + end + + it "requires a title" do + expect(movie.valid?).must_equal false end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..3f7dc7d3e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, @@ -9,7 +10,6 @@ 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" From 82cfee5a16beb5663b8d1ff6d1b8cb3f411d80b1 Mon Sep 17 00:00:00 2001 From: Jansen Date: Tue, 14 May 2019 14:54:48 -0700 Subject: [PATCH 05/32] Fill out movies#index action; Add route; Add test --- app/controllers/movies_controller.rb | 3 +++ config/routes.rb | 4 +--- test/controllers/movies_controller_test.rb | 21 ++++++++++++++------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 57ceb01a5..2b0bdf2fc 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,8 @@ class MoviesController < ApplicationController def index + movies = Movie.all + + render status: :ok, json: movies.as_json(only: [:title, :release_data, :overview, :inventory, :id]) end def zomg diff --git a/config/routes.rb b/config/routes.rb index c45e83053..4b0fec62a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,5 @@ Rails.application.routes.draw do - get 'customers/index' - get 'movies/index' - get 'movies/zomg' + resources :movies, only: [:index] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html # get /customers diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 5df2b1757..bedd8037c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,14 +1,21 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? - end + describe "index" do + it "can redner without crashing" do + get movies_path - it "should get zomg" do - get movies_zomg_url - value(response).must_be :success? + must_respond_with :ok + end end + # it "should get index" do + # get movies_index_url + # value(response).must_be :success? + # end + + # it "should get zomg" do + # get movies_zomg_url + # value(response).must_be :success? + # end end From 7f0c38cda619004c2cd9f0050feeda1777c8c430 Mon Sep 17 00:00:00 2001 From: Jansen Date: Tue, 14 May 2019 15:01:05 -0700 Subject: [PATCH 06/32] Add customers#index action; Add route; Add test --- app/controllers/customers_controller.rb | 3 +++ config/routes.rb | 1 + test/controllers/customers_controller_test.rb | 13 ++++++++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..6c231761a 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,7 @@ class CustomersController < ApplicationController def index + customers = Customer.all + + render status: :ok, json: customers.as_json(only: [:name, :registered_at, :phone, :id]) end end diff --git a/config/routes.rb b/config/routes.rb index 4b0fec62a..667f5e20a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do resources :movies, only: [:index] + resources :customers, only: [:index] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html # get /customers diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5ec6f20b..9ef5fd235 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,16 @@ require "test_helper" describe CustomersController do - it "should get index" do - get customers_index_url - value(response).must_be :success? + describe "index" do + it "can render without crashing" do + get customers_path + + must_respond_with :ok + end end + # it "should get index" do + # get customers_index_url + # value(response).must_be :success? + # end end From 18c981bccb630ac5d7ff526ddf15b04c6ae12605 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Tue, 14 May 2019 16:11:26 -0700 Subject: [PATCH 07/32] Migration to customer model, added column --- db/migrate/20190514224852_new_column_customer_checked_out.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20190514224852_new_column_customer_checked_out.rb diff --git a/db/migrate/20190514224852_new_column_customer_checked_out.rb b/db/migrate/20190514224852_new_column_customer_checked_out.rb new file mode 100644 index 000000000..d1629922e --- /dev/null +++ b/db/migrate/20190514224852_new_column_customer_checked_out.rb @@ -0,0 +1,5 @@ +class NewColumnCustomerCheckedOut < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end From 9d0041739f43ea0d5f7d49aef28a21a2ca50612c Mon Sep 17 00:00:00 2001 From: Jansen Date: Tue, 14 May 2019 16:42:48 -0700 Subject: [PATCH 08/32] Add available_inventory column to Movies; Set default to match value in inventory --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/customers_controller.rb | 2 +- app/models/movie.rb | 8 ++++++++ ...41_add_available_inventory_to_movies_table.rb | 5 +++++ db/schema.rb | 4 +++- 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 .DS_Store create mode 100644 db/migrate/20190514232541_add_available_inventory_to_movies_table.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3f37bac42bc04d3e0e9c42085fd5f50cf2214390 GIT binary patch literal 6148 zcmeHK%}OId5bjQ*&TK$NkVRn+4SU#&he*U+hxl_6l%1dlUE>Thn1Nv?%yg1N2n_oG zK7e~&^)+;#V&7w5V5_=2vJ&?uVx$VHzv}9$YWka@e;8xDJqR}$a~NY5C}PEi<{80p z)ETK54B``QZE2^^c!7w|DmsDu;3SRh6t5oWd_K9;q05d75PDCHSWC z(>Ow6fEXYK=AHqwv03%GUkNRM7$62-ngQG&1Sq0wu+*rw4ruWDh~qUx6tM9vfhY{R z21|`F0>X7FpibrHiNSR`_=Smc4VD^pI^$|)sAFd4=7qx5?BEwFoN-qpwZs51@RWh7 z?mBq>@BRP%|1^nu!~ikyt{C98U2nGyOEPEc%;NB@6`&WOC>U32d`tmD9mNofNAVh{ a67UN&09}KnM(}{pML^L&4KeVl4EzNV1z<1$ literal 0 HcmV?d00001 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6c231761a..866681b33 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render status: :ok, json: customers.as_json(only: [:name, :registered_at, :phone, :id]) + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index d34b59f22..6684f72ce 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,11 @@ class Movie < ApplicationRecord + before_create :set_available_inventory_default + validates :title, presence: true + + private + + def set_available_inventory_default + self.available_inventory = self.inventory + end end diff --git a/db/migrate/20190514232541_add_available_inventory_to_movies_table.rb b/db/migrate/20190514232541_add_available_inventory_to_movies_table.rb new file mode 100644 index 000000000..fecd67071 --- /dev/null +++ b/db/migrate/20190514232541_add_available_inventory_to_movies_table.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMoviesTable < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 216257768..83379a6a3 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: 2019_05_14_210019) do +ActiveRecord::Schema.define(version: 2019_05_14_232541) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -34,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end end From e483517a4b8e7a4b3046d4a0247b0f2d4593753f Mon Sep 17 00:00:00 2001 From: Jansen Date: Tue, 14 May 2019 16:57:27 -0700 Subject: [PATCH 09/32] Add available_inventory to json render; Add tests for customers_controller --- app/controllers/movies_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2b0bdf2fc..11d07ba33 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,7 +2,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render status: :ok, json: movies.as_json(only: [:title, :release_data, :overview, :inventory, :id]) + render status: :ok, json: movies.as_json(only: [:title, :release_data, :overview, :inventory, :available_inventory]) end def zomg diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 9ef5fd235..0b1e553d8 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,6 +7,34 @@ must_respond_with :ok end + + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the 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 # it "should get index" do # get customers_index_url From 9d8700f772db6fb68ace3b201337b6413d48af33 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Wed, 15 May 2019 12:56:09 -0700 Subject: [PATCH 10/32] fixed typo in movies controller --- Gemfile.lock | 2 +- app/controllers/movies_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 87d307d81..87697ba34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,4 +166,4 @@ RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 1.17.3 + 2.0.1 diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 11d07ba33..77514c04c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,7 +2,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render status: :ok, json: movies.as_json(only: [:title, :release_data, :overview, :inventory, :available_inventory]) + render status: :ok, json: movies.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]) end def zomg From 0113e5e4e42b902a8bcc5d5a42fff28391483c9e Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Wed, 15 May 2019 13:03:30 -0700 Subject: [PATCH 11/32] added tests movies controller index action --- test/controllers/movies_controller_test.rb | 35 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index bedd8037c..d5538d4d9 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -2,16 +2,41 @@ describe MoviesController do describe "index" do - it "can redner without crashing" do + it "can render without crashing" do get movies_path must_respond_with :ok end + + it "returns json" do + get movies_path + + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns an Array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns customers with exactly the required fields" do + keys = %w(available_inventory id inventory overview release_date title) + get movies_path + body = JSON.parse(response.body) + body.each do |movies| + movies.keys.sort.must_equal keys + end + end end - # it "should get index" do - # get movies_index_url - # value(response).must_be :success? - # end # it "should get zomg" do # get movies_zomg_url From 20203757d2c1eba31647c945cc9c6ff8fa867eb9 Mon Sep 17 00:00:00 2001 From: Jansen Date: Wed, 15 May 2019 13:17:38 -0700 Subject: [PATCH 12/32] Add movies#show action and two show tests --- Gemfile.lock | 2 +- app/controllers/movies_controller.rb | 6 ++++++ config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 20 ++++++++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 87697ba34..87d307d81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,4 +166,4 @@ RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 2.0.1 + 1.17.3 diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 77514c04c..4228e0f2c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,6 +5,12 @@ def index render status: :ok, json: movies.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]) end + def show + movie = Movie.find_by(id: params[:id]) + + render status: :ok, json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]) + end + def zomg render json: { message: "It works!" } end diff --git a/config/routes.rb b/config/routes.rb index 667f5e20a..d8dfb2ee7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - resources :movies, only: [:index] + resources :movies, only: [:index, :show] resources :customers, only: [:index] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d5538d4d9..fff2cc349 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -38,6 +38,26 @@ end end + describe "show" do + before do + @movie = movies(:blacksmith) + end + it "can get a movie" do + get movie_path(@movie) + + must_respond_with :success + end + + it "returns a movie with the required fields" do + keys = %w(available_inventory id inventory overview release_date title) + + get movie_path(@movie.id) + + body = JSON.parse(response.body) + body.keys.sort.must_equal keys + end + end + # it "should get zomg" do # get movies_zomg_url # value(response).must_be :success? From 0596d5aa085751162654a29aa3d5b7c935131cbc Mon Sep 17 00:00:00 2001 From: Jansen Date: Wed, 15 May 2019 13:24:23 -0700 Subject: [PATCH 13/32] New show tests Movie Controller, added code for invalid requests --- app/controllers/movies_controller.rb | 6 +++++- test/controllers/movies_controller_test.rb | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4228e0f2c..cb561c8f9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,11 @@ def index def show movie = Movie.find_by(id: params[:id]) - render status: :ok, json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]) + if !movie.nil? + render status: :ok, json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]) + else + render json: { ok: false, message: "Movie not found" }, status: :not_found + end end def zomg diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index fff2cc349..3a7b6520c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -56,6 +56,21 @@ body = JSON.parse(response.body) body.keys.sort.must_equal keys end + + it "still returns JSON if the movie is bogus" do + get movie_path(id: -1) + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns not_found for a nonexistant movie" do + get movie_path(id: -1) + must_respond_with :not_found + end + + it "still returns JSON if the request is bad" do + get movie_path("bad data") + expect(response.header["Content-Type"]).must_include "json" + end end # it "should get zomg" do From 45748388943542efe938e6588b2990a881b3defe Mon Sep 17 00:00:00 2001 From: Jansen Date: Wed, 15 May 2019 13:26:15 -0700 Subject: [PATCH 14/32] Add movie_params to Movies Controller --- app/controllers/movies_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index cb561c8f9..0673666d5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,4 +18,10 @@ def show def zomg render json: { message: "It works!" } end + + private + + def movie_params + params.permit(:title, :release_date, :overview, :inventory) + end end From 83236a539468bfa6c0d3b7c665048bcd735a4ea9 Mon Sep 17 00:00:00 2001 From: Jansen Date: Wed, 15 May 2019 13:42:45 -0700 Subject: [PATCH 15/32] Add movies#create route, action and tests --- app/controllers/movies_controller.rb | 7 ++++++- config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 0673666d5..7c041c4ac 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,6 +15,11 @@ def show end end + def create + movie = Movie.new(movie_params) + movie.save + end + def zomg render json: { message: "It works!" } end @@ -22,6 +27,6 @@ def zomg private def movie_params - params.permit(:title, :release_date, :overview, :inventory) + params.require(:movie).permit(:title, :release_date, :overview, :inventory) end end diff --git a/config/routes.rb b/config/routes.rb index d8dfb2ee7..d4f7d4986 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - resources :movies, only: [:index, :show] + resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3a7b6520c..f7715930a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -71,6 +71,23 @@ get movie_path("bad data") expect(response.header["Content-Type"]).must_include "json" end + + describe "create" do + let(:movie_data) { + { + title: "Test Story", + overview: "Two people test their code for homework", + release_date: 2019 - 01 - 18, + inventory: 3, + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: { movie: movie_data } + }.must_change "Movie.count", 1 + end + end end # it "should get zomg" do From 226146c6b23eab034d4b90b7294c1fcc3fc9eb7d Mon Sep 17 00:00:00 2001 From: Jansen Date: Wed, 15 May 2019 13:54:02 -0700 Subject: [PATCH 16/32] Add conditionals for invalid requests in movies#show. Add tests --- app/controllers/movies_controller.rb | 6 +++++- test/controllers/movies_controller_test.rb | 23 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7c041c4ac..80810a2bc 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -17,7 +17,11 @@ def show def create movie = Movie.new(movie_params) - movie.save + if movie.save + render json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]) + else + render json: { errors: movie.errors.messages }, status: :bad_request + end end def zomg diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f7715930a..373286493 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -86,6 +86,29 @@ expect { post movies_path, params: { movie: movie_data } }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + new_movie = Movie.find(body["id"].to_i) + expect(new_movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "returns an error for invalid movie data" do + movie_data["title"] = nil + + expect { + post movies_path, params: { movie: movie_data } + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request end end end From ecae56fab7b9624829564436438f4a257093c98f Mon Sep 17 00:00:00 2001 From: Jansen Date: Wed, 15 May 2019 14:21:47 -0700 Subject: [PATCH 17/32] Correct movie_params; Fix tests accordingly --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 80810a2bc..de1853f5a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -31,6 +31,6 @@ def zomg private def movie_params - params.require(:movie).permit(:title, :release_date, :overview, :inventory) + params.permit(:title, :release_date, :overview, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 373286493..7c8e3ff67 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -84,7 +84,7 @@ it "creates a new movie given valid data" do expect { - post movies_path, params: { movie: movie_data } + post movies_path, params: movie_data }.must_change "Movie.count", 1 body = JSON.parse(response.body) @@ -100,7 +100,7 @@ movie_data["title"] = nil expect { - post movies_path, params: { movie: movie_data } + post movies_path, params: movie_data }.wont_change "Movie.count" body = JSON.parse(response.body) From 6d1b80102a28079b280fa63e5c76930b969468c1 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Wed, 15 May 2019 15:00:41 -0700 Subject: [PATCH 18/32] Added Rental model --- Gemfile.lock | 2 +- app/models/rental.rb | 2 ++ db/migrate/20190515214022_create_rentals.rb | 11 +++++++++++ .../20190515214358_add_foreign_keys_rental.rb | 6 ++++++ db/schema.rb | 16 +++++++++++++++- test/fixtures/rentals.yml | 15 +++++++++++++++ test/models/rental_test.rb | 9 +++++++++ 7 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190515214022_create_rentals.rb create mode 100644 db/migrate/20190515214358_add_foreign_keys_rental.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/Gemfile.lock b/Gemfile.lock index 87d307d81..87697ba34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,4 +166,4 @@ RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 1.17.3 + 2.0.1 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/20190515214022_create_rentals.rb b/db/migrate/20190515214022_create_rentals.rb new file mode 100644 index 000000000..b34e58f4c --- /dev/null +++ b/db/migrate/20190515214022_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.datetime :check_out + t.datetime :due_date + t.datetime :check_in + + t.timestamps + end + end +end diff --git a/db/migrate/20190515214358_add_foreign_keys_rental.rb b/db/migrate/20190515214358_add_foreign_keys_rental.rb new file mode 100644 index 000000000..5ae3db771 --- /dev/null +++ b/db/migrate/20190515214358_add_foreign_keys_rental.rb @@ -0,0 +1,6 @@ +class AddForeignKeysRental < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 83379a6a3..849d99e58 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: 2019_05_14_232541) do +ActiveRecord::Schema.define(version: 2019_05_15_214358) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,4 +38,18 @@ t.integer "available_inventory" end + create_table "rentals", force: :cascade do |t| + t.datetime "check_out" + t.datetime "due_date" + t.datetime "check_in" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..31cde5f55 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +rental_one: + check_out: 2019-05-15 14:40:22 + due_date: 2019-05-20 14:40:22 + check_in: 2019-05-21 14:40:22 + customer: bob + movie: blacksmith + +rental_two: + check_out: 2019-05-15 14:40:22 + due_date: 2019-05-20 14:40:22 + check_in: 2019-05-21 14:40:22 + customer: sarah + movie: savior 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 389d11e9de50da3cba33d35edd925653b1330453 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Wed, 15 May 2019 15:23:03 -0700 Subject: [PATCH 19/32] added relationships between rentals and customers and movies --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + app/models/rental.rb | 2 ++ test/models/rental_test.rb | 6 +++--- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index a62356cd9..453c4c065 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,4 @@ class Customer < ApplicationRecord + has_many :rentals validates :name, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index 6684f72ce..47e3080e9 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,5 @@ class Movie < ApplicationRecord + has_many :rentals before_create :set_available_inventory_default validates :title, presence: true diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..34d3f4df8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..081d544c9 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -3,7 +3,7 @@ describe Rental do let(:rental) { Rental.new } - it "must be valid" do - value(rental).must_be :valid? - end + # it "must be valid" do + # value(rental).must_be :valid? + # end end From b936da33d859a36aa99e965b5a125974b2dedeb2 Mon Sep 17 00:00:00 2001 From: Jansen Date: Wed, 15 May 2019 15:53:38 -0700 Subject: [PATCH 20/32] Add check_out and check_in actions to rentals_controller --- Gemfile.lock | 2 +- app/controllers/rentals_controller.rb | 28 +++++++++++++++++++++ config/routes.rb | 2 ++ test/controllers/rentals_controller_test.rb | 14 +++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/Gemfile.lock b/Gemfile.lock index 87697ba34..87d307d81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,4 +166,4 @@ RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 2.0.1 + 1.17.3 diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..c9436aca2 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,28 @@ +class RentalsController < ApplicationController + def check_out + movie = Movie.find_by(id: params[:movie][:id]) + customer = Customer.find_by(id: params[:customer][:id]) + rental = Rental.new(check_out: DateTime.now, movie_id: movie.id, customer_id: customer.id, due_date: DateTime.now + 7) + + if rental.save + # Decrease Inventory by 1 (via helper method) + else + # Error message + end + end + + def check_in + movie = Movie.find_by(id: params[:movie][:id]) + customer = Customer.find_by(id: params[:customer][:id]) + rental = Rental.where(customer_id: customer.id, movie_id: movie.id) + + # rental.update(check_in: DateTime.now ) + + #if successful + # Increase Inventory by 1 (via helper method) + #else + # Error message + #end + + end +end diff --git a/config/routes.rb b/config/routes.rb index d4f7d4986..a56371a29 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do + get 'rentals/check_out' + get 'rentals/check_in' resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..cfd1b198e --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe RentalsController do + it "should get check_out" do + get rentals_check_out_url + value(response).must_be :success? + end + + it "should get check_in" do + get rentals_check_in_url + value(response).must_be :success? + end + +end From b94cb7110162d22a8165067d94b9ca561dd64782 Mon Sep 17 00:00:00 2001 From: Jansen Date: Thu, 16 May 2019 09:11:34 -0700 Subject: [PATCH 21/32] Comment out Rails-generated tests in Videos controller --- test/controllers/rentals_controller_test.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index cfd1b198e..cd544ff14 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,14 +1,14 @@ require "test_helper" describe RentalsController do - it "should get check_out" do - get rentals_check_out_url - value(response).must_be :success? - end + # it "should get check_out" do + # get rentals_check_out_url + # value(response).must_be :success? + # end - it "should get check_in" do - get rentals_check_in_url - value(response).must_be :success? - end + # it "should get check_in" do + # get rentals_check_in_url + # value(response).must_be :success? + # end end From bf3e8d1948d6a92c45563eed4f3c393604596860 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 16 May 2019 10:01:31 -0700 Subject: [PATCH 22/32] Added helper method to movie model with tests --- app/controllers/rentals_controller.rb | 3 ++- app/models/movie.rb | 7 +++++++ config/routes.rb | 10 +++------- test/fixtures/movies.yml | 2 ++ test/models/movie_test.rb | 20 ++++++++++++++++++++ 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index c9436aca2..e64e58259 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,7 +5,8 @@ def check_out rental = Rental.new(check_out: DateTime.now, movie_id: movie.id, customer_id: customer.id, due_date: DateTime.now + 7) if rental.save - # Decrease Inventory by 1 (via helper method) + movie.decrease_inventory + render status: :ok, json: rental.as_json(only: [:id, :customer_id, :movie_id, :check_out, :due_date]) else # Error message end diff --git a/app/models/movie.rb b/app/models/movie.rb index 47e3080e9..2a11812b2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,6 +4,13 @@ class Movie < ApplicationRecord validates :title, presence: true + def decrease_inventory + if self.available_inventory > 0 + self.available_inventory -= 1 + self.save + end + end + private def set_available_inventory_default diff --git a/config/routes.rb b/config/routes.rb index a56371a29..92fbab4ca 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,14 +1,10 @@ Rails.application.routes.draw do - get 'rentals/check_out' - get 'rentals/check_in' + # get 'rentals/check_out' + # get 'rentals/check_in' resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - # get /customers - # get /movies - # get /movies/:id <=== id - # post /movies + post "rentals/check_out", to: "rentals#check_out", as: "check_out" # post /rentals/check-out <==== customer id, movie id # post /rentals/check-in <==== customer id, movie id diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 651ef0a81..b3b70b778 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,9 +5,11 @@ blacksmith: overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life." release_date: 1979-01-18 inventory: 10 + available_inventory: 10 savior: title: "Savior Of The Curse" overview: "The strange woman claims the boy has a DNA strain..." release_date: 2010-11-05 inventory: 1 + available_inventory: 0 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e38522f6f..3d7570ad8 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -11,4 +11,24 @@ it "requires a title" do expect(movie.valid?).must_equal false end + + describe "decrease_inventory" do + it "decreases inventory by 1" do + before_inventory = valid_movie.available_inventory + + valid_movie.decrease_inventory + after_inventory = valid_movie.available_inventory + + expect(after_inventory).must_equal before_inventory - 1 + end + + it "doesn't decrease inventory if no movies are available" do + empty_movie = movies(:savior) + expect(empty_movie.available_inventory).must_equal 0 + + empty_movie.decrease_inventory + + expect(empty_movie.available_inventory).must_equal 0 + end + end end From 82b4065d36d6e6c13a0ded9c8451794bc1fc6181 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 16 May 2019 11:51:54 -0700 Subject: [PATCH 23/32] Rentals Controller checkout method for valid rental and test --- app/controllers/rentals_controller.rb | 9 ++++++--- config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e64e58259..d4d219d74 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,14 +1,17 @@ class RentalsController < ApplicationController def check_out - movie = Movie.find_by(id: params[:movie][:id]) - customer = Customer.find_by(id: params[:customer][:id]) + movie = Movie.find_by(id: params[:movie_id]) + customer = Customer.find_by(id: params[:customer_id]) + + # make sure it can find movie, movie as avail inventory, can find customer + rental = Rental.new(check_out: DateTime.now, movie_id: movie.id, customer_id: customer.id, due_date: DateTime.now + 7) if rental.save movie.decrease_inventory render status: :ok, json: rental.as_json(only: [:id, :customer_id, :movie_id, :check_out, :due_date]) else - # Error message + render json: { message: "No rental created" } end end diff --git a/config/routes.rb b/config/routes.rb index 92fbab4ca..e15701a36 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,7 @@ resources :movies, only: [:index, :show, :create] resources :customers, only: [:index] - post "rentals/check_out", to: "rentals#check_out", as: "check_out" + post "rentals/check-out", to: "rentals#check_out", as: "check_out" # post /rentals/check-out <==== customer id, movie id # post /rentals/check-in <==== customer id, movie id diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index cd544ff14..a41edb253 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,6 +1,24 @@ require "test_helper" describe RentalsController do + let(:valid_movie) { movies(:blacksmith) } + let(:valid_customer) { customers(:sarah) } + describe "check_out" do + it "should be able to create a rental with a valid customer and valid movie" do + before_rental = valid_movie.available_inventory + rental_hash = { + rental: { + customer_id: valid_customer.id, + movie_id: valid_movie.id, + }, + } + + expect { post check_out_path, params: rental_hash[:rental] }.must_change "Rental.count", 1 + + after_rental = Movie.find_by(id: valid_movie.id) + expect(after_rental.available_inventory).must_equal before_rental - 1 + end + end # it "should get check_out" do # get rentals_check_out_url # value(response).must_be :success? From 3d26742355e9967440d8f4a7d8fbae205fde2819 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 16 May 2019 12:19:30 -0700 Subject: [PATCH 24/32] Add conditionals checking for existing movie and customer. Add tests. All tests passing --- app/controllers/rentals_controller.rb | 11 ++++++++++ test/controllers/rentals_controller_test.rb | 24 +++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d4d219d74..0f1327b04 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,6 +3,17 @@ def check_out movie = Movie.find_by(id: params[:movie_id]) customer = Customer.find_by(id: params[:customer_id]) + if movie.nil? && customer.nil? + render status: :not_found, json: { errors: ["Customer with id #{params[:customer_id]} was not found.", "Movie with id #{params[:movie_id]} was not found"] } + return + elsif movie.nil? + render status: :not_found, json: { errors: ["Movie with id #{params[:movie_id]} was not found."] } + return + elsif customer.nil? + render status: :not_found, json: { errors: ["Customer with id #{params[:customer_id]} was not found."] } + return + end + # make sure it can find movie, movie as avail inventory, can find customer rental = Rental.new(check_out: DateTime.now, movie_id: movie.id, customer_id: customer.id, due_date: DateTime.now + 7) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a41edb253..af7f2fab6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -18,6 +18,30 @@ after_rental = Movie.find_by(id: valid_movie.id) expect(after_rental.available_inventory).must_equal before_rental - 1 end + + it "returns not_found if it can't find a movie" do + rental_hash = { + rental: { + customer_id: valid_customer.id, + movie_id: "bogus id", + }, + } + + expect { post check_out_path, params: rental_hash[:rental] }.wont_change "Rental.count" + must_respond_with :not_found + end + + it "returns not_found if it can't find a customer" do + rental_hash = { + rental: { + customer_id: "bogus customer", + movie_id: valid_movie.id, + }, + } + + expect { post check_out_path, params: rental_hash[:rental] }.wont_change "Rental.count" + must_respond_with :not_found + end end # it "should get check_out" do # get rentals_check_out_url From 5c70f7c601c706f104ce280a0de6aacebc8f6b61 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 16 May 2019 12:35:08 -0700 Subject: [PATCH 25/32] Add conditionals for rentals#check_out action; Add tests --- Gemfile.lock | 2 +- app/controllers/rentals_controller.rb | 5 ++++- test/controllers/rentals_controller_test.rb | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 87d307d81..87697ba34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,4 +166,4 @@ RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 1.17.3 + 2.0.1 diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 0f1327b04..b1cc7558d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,7 +14,10 @@ def check_out return end - # make sure it can find movie, movie as avail inventory, can find customer + unless movie.available_inventory > 0 + render status: :precondition_failed, json: { errors: ["This movie is currently unavailable."] } + return + end rental = Rental.new(check_out: DateTime.now, movie_id: movie.id, customer_id: customer.id, due_date: DateTime.now + 7) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index af7f2fab6..3fd3d35e6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,6 +2,7 @@ describe RentalsController do let(:valid_movie) { movies(:blacksmith) } + let(:unavail_movie) { movies(:savior) } let(:valid_customer) { customers(:sarah) } describe "check_out" do it "should be able to create a rental with a valid customer and valid movie" do @@ -42,6 +43,19 @@ expect { post check_out_path, params: rental_hash[:rental] }.wont_change "Rental.count" must_respond_with :not_found end + + it "will do something and not create a rental if there is no available inventory for specified movie" do + rental_hash = { + rental: { + customer_id: valid_customer.id, + movie_id: unavail_movie.id, + }, + } + + expect(unavail_movie.available_inventory).must_equal 0 + expect { post check_out_path, params: rental_hash[:rental] }.wont_change "Rental.count" + must_respond_with :precondition_failed + end end # it "should get check_out" do # get rentals_check_out_url From ae570494cb37fe048c71f5848830ad0ba0bc29fc Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 16 May 2019 12:59:13 -0700 Subject: [PATCH 26/32] Customer model action increase_checked_out_count with test --- app/controllers/rentals_controller.rb | 1 + app/models/customer.rb | 5 +++++ test/fixtures/customers.yml | 3 +++ test/models/customer_test.rb | 11 +++++++++++ 4 files changed, 20 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b1cc7558d..b8486ac44 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -23,6 +23,7 @@ def check_out if rental.save movie.decrease_inventory + customer.increase_checked_out_count render status: :ok, json: rental.as_json(only: [:id, :customer_id, :movie_id, :check_out, :due_date]) else render json: { message: "No rental created" } diff --git a/app/models/customer.rb b/app/models/customer.rb index 453c4c065..2c0068c1a 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,9 @@ class Customer < ApplicationRecord has_many :rentals validates :name, presence: true + + def increase_checked_out_count + self.movies_checked_out_count += 1 + self.save + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 99ea32ef1..3becf518a 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,6 +8,7 @@ bob: state: WA postal_code: 98100 phone: 206-111-1111 + movies_checked_out_count: 1 sarah: name: Sarah McPhee @@ -17,3 +18,5 @@ sarah: state: WA postal_code: 98100 phone: 206-111-2222 + movies_checked_out_count: 0 + diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index b98e2b65f..a74f2e696 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -11,4 +11,15 @@ it "requires a name" do expect(customer.valid?).must_equal false end + + describe "increase_checked_out_count" do + it "increases the customer checked_out_count by 1" do + before_count = valid_customer.movies_checked_out_count + + valid_customer.increase_checked_out_count + after_count = valid_customer.movies_checked_out_count + + expect(after_count).must_equal before_count + 1 + end + end end From 3fc675a720435b03097db251276fb2d7ab9b3c3f Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 16 May 2019 13:05:35 -0700 Subject: [PATCH 27/32] Rental Controller, added render json when rental does not save --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b8486ac44..7b1a520f6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -26,7 +26,7 @@ def check_out customer.increase_checked_out_count render status: :ok, json: rental.as_json(only: [:id, :customer_id, :movie_id, :check_out, :due_date]) else - render json: { message: "No rental created" } + render status: :bad_request, json: { errors: rental.errors.messages } end end From af93aceb817f218ba6b8aef2dfe33d8b46a419d7 Mon Sep 17 00:00:00 2001 From: Jansen Date: Thu, 16 May 2019 13:12:32 -0700 Subject: [PATCH 28/32] Clarify test inside rentals_controller_test --- Gemfile.lock | 2 +- test/controllers/rentals_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 87697ba34..87d307d81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,4 +166,4 @@ RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 2.0.1 + 1.17.3 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 3fd3d35e6..8ffdec24d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -44,7 +44,7 @@ must_respond_with :not_found end - it "will do something and not create a rental if there is no available inventory for specified movie" do + it "responds with bad request if there is no available inventory for specified movie" do rental_hash = { rental: { customer_id: valid_customer.id, From f31be11ea20d0df308b36a179f94b38af680c963 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 16 May 2019 13:18:40 -0700 Subject: [PATCH 29/32] Customer model added decrease_checked_out_count method and test --- Gemfile.lock | 2 +- app/models/customer.rb | 5 +++++ test/models/customer_test.rb | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 87d307d81..87697ba34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,4 +166,4 @@ RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 1.17.3 + 2.0.1 diff --git a/app/models/customer.rb b/app/models/customer.rb index 2c0068c1a..73fa43634 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,4 +6,9 @@ def increase_checked_out_count self.movies_checked_out_count += 1 self.save end + + def decrease_checked_out_count + self.movies_checked_out_count -= 1 + self.save + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a74f2e696..8715d5881 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -22,4 +22,15 @@ expect(after_count).must_equal before_count + 1 end end + + describe "decrease_checked_out_count" do + it "decreases the customer checked_out_count by 1" do + before_count = valid_customer.movies_checked_out_count + + valid_customer.decrease_checked_out_count + after_count = valid_customer.movies_checked_out_count + + expect(after_count).must_equal before_count - 1 + end + end end From 446806c1edbb597c067e960c7d884c14c9d12088 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 16 May 2019 13:26:18 -0700 Subject: [PATCH 30/32] Movie Model added increase_inventory method and test --- app/models/movie.rb | 5 +++++ test/models/movie_test.rb | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index 2a11812b2..d172546f2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -11,6 +11,11 @@ def decrease_inventory end end + def increase_inventory + self.available_inventory += 1 + self.save + end + private def set_available_inventory_default diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 3d7570ad8..34f1614fe 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -31,4 +31,15 @@ expect(empty_movie.available_inventory).must_equal 0 end end + + describe "increase_inventory" do + it "increases inventory by 1" do + before_inventory = valid_movie.available_inventory + + valid_movie.increase_inventory + after_inventory = valid_movie.available_inventory + + expect(after_inventory).must_equal before_inventory + 1 + end + end end From 3f4f5ff9cefe9a550bdc6ce51aac3ba2b29499ae Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Fri, 17 May 2019 14:50:54 -0700 Subject: [PATCH 31/32] Add rentals#check_in action; Add test --- app/controllers/rentals_controller.rb | 26 ++++++++++----- config/routes.rb | 1 + test/controllers/rentals_controller_test.rb | 37 ++++++++++++++++----- test/fixtures/customers.yml | 2 +- test/fixtures/rentals.yml | 4 +-- test/models/rental_test.rb | 10 ++++-- 6 files changed, 57 insertions(+), 23 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 7b1a520f6..30c0319d7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,3 +1,5 @@ +require "pry" + class RentalsController < ApplicationController def check_out movie = Movie.find_by(id: params[:movie_id]) @@ -31,17 +33,23 @@ def check_out end def check_in - movie = Movie.find_by(id: params[:movie][:id]) - customer = Customer.find_by(id: params[:customer][:id]) - rental = Rental.where(customer_id: customer.id, movie_id: movie.id) + movie = Movie.find_by(id: params[:movie_id]) + customer = Customer.find_by(id: params[:customer_id]) + rental = Rental.where(customer_id: customer.id, movie_id: movie.id).order(due_date: :asc).first - # rental.update(check_in: DateTime.now ) + unless rental + render status: :not_found, json: { errors: ["Rental not found. Please check your movie and customer ID again."] } + return + end - #if successful - # Increase Inventory by 1 (via helper method) - #else - # Error message - #end + rental.check_in = DateTime.now + if rental.save + # binding.pry + movie.increase_inventory + customer.decrease_checked_out_count + else + render status: :bad_request, json: { errors: rental.errors.messages } + end end end diff --git a/config/routes.rb b/config/routes.rb index e15701a36..e960f0e14 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,7 @@ resources :customers, only: [:index] post "rentals/check-out", to: "rentals#check_out", as: "check_out" + post "rentals/check-in", to: "rentals#check_in", as: "check_in" # post /rentals/check-out <==== customer id, movie id # post /rentals/check-in <==== customer id, movie id diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8ffdec24d..b62932e1f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,9 +1,11 @@ require "test_helper" +require "pry" describe RentalsController do let(:valid_movie) { movies(:blacksmith) } let(:unavail_movie) { movies(:savior) } let(:valid_customer) { customers(:sarah) } + let(:valid_rental) { rentals(:rental_one) } describe "check_out" do it "should be able to create a rental with a valid customer and valid movie" do before_rental = valid_movie.available_inventory @@ -57,14 +59,33 @@ must_respond_with :precondition_failed end end - # it "should get check_out" do - # get rentals_check_out_url - # value(response).must_be :success? - # end - # it "should get check_in" do - # get rentals_check_in_url - # value(response).must_be :success? - # end + describe "check_in" do + before do + @rental_hash = { + rental: { + customer_id: valid_customer.id, + movie_id: valid_movie.id, + }, + } + + post check_out_path, params: @rental_hash[:rental] + end + it "should be able to update a rental with a valid customer and valid movie" do + rental = Rental.where(customer_id: valid_customer.id, movie_id: valid_movie.id).order(due_date: :asc).first + + before_checkin_inventory = Movie.find_by(id: valid_movie.id).available_inventory + before_checkin_movies_count = Customer.find_by(id: valid_customer.id).movies_checked_out_count + + expect { post check_in_path, params: @rental_hash[:rental] }.wont_change "Rental.count" + rental.reload + after_checkin_movie = Movie.find_by(id: rental.movie_id) + after_checkin_movies_count = Customer.find_by(id: valid_customer.id).movies_checked_out_count + + expect(rental.check_in).must_be_kind_of ActiveSupport::TimeWithZone + expect(after_checkin_movie.available_inventory).must_equal before_checkin_inventory + 1 + expect(after_checkin_movies_count).must_equal before_checkin_movies_count - 1 + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 3becf518a..a430466bf 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -18,5 +18,5 @@ sarah: state: WA postal_code: 98100 phone: 206-111-2222 - movies_checked_out_count: 0 + movies_checked_out_count: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 31cde5f55..185f89b2a 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,13 +3,13 @@ rental_one: check_out: 2019-05-15 14:40:22 due_date: 2019-05-20 14:40:22 - check_in: 2019-05-21 14:40:22 + check_in: "lol" customer: bob movie: blacksmith rental_two: check_out: 2019-05-15 14:40:22 due_date: 2019-05-20 14:40:22 - check_in: 2019-05-21 14:40:22 + check_in: customer: sarah movie: savior diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 081d544c9..5ed2d3b68 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -3,7 +3,11 @@ describe Rental do let(:rental) { Rental.new } - # it "must be valid" do - # value(rental).must_be :valid? - # end + describe "relationships" do + it "is only valid if the rental has a customer" do + end + + it "is only valid if the rental has a movie" do + end + end end From 45531725c6217337999d09ab656ac07b8328f353 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Fri, 17 May 2019 15:23:53 -0700 Subject: [PATCH 32/32] Add validation tests; Finish tests for check_in action; All tests passing --- app/controllers/rentals_controller.rb | 14 +++++++- test/controllers/rentals_controller_test.rb | 36 +++++++++++++++++++++ test/fixtures/movies.yml | 7 ++++ test/models/rental_test.rb | 10 +++++- 4 files changed, 65 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 30c0319d7..0f3a4211d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -35,6 +35,18 @@ def check_out def check_in movie = Movie.find_by(id: params[:movie_id]) customer = Customer.find_by(id: params[:customer_id]) + + if movie.nil? && customer.nil? + render status: :not_found, json: { errors: ["Customer with id #{params[:customer_id]} was not found.", "Movie with id #{params[:movie_id]} was not found"] } + return + elsif movie.nil? + render status: :not_found, json: { errors: ["Movie with id #{params[:movie_id]} was not found."] } + return + elsif customer.nil? + render status: :not_found, json: { errors: ["Customer with id #{params[:customer_id]} was not found."] } + return + end + rental = Rental.where(customer_id: customer.id, movie_id: movie.id).order(due_date: :asc).first unless rental @@ -45,9 +57,9 @@ def check_in rental.check_in = DateTime.now if rental.save - # binding.pry movie.increase_inventory customer.decrease_checked_out_count + render status: :ok, json: { message: "Check-in successful!" } else render status: :bad_request, json: { errors: rental.errors.messages } end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b62932e1f..60e733cf5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -87,5 +87,41 @@ expect(after_checkin_movie.available_inventory).must_equal before_checkin_inventory + 1 expect(after_checkin_movies_count).must_equal before_checkin_movies_count - 1 end + + it "returns not_found if it can't find a rental's customer" do + rental_hash = { + rental: { + customer_id: Customer.all.last.id + 1, + movie_id: valid_movie.id, + }, + } + + expect { post check_in_path, params: rental_hash[:rental] }.wont_change "Rental.count" + must_respond_with :not_found + end + + it "returns not_found if it can't find a rental's movie" do + rental_hash = { + rental: { + customer_id: valid_customer.id, + movie_id: "bogus id", + }, + } + + expect { post check_in_path, params: rental_hash[:rental] }.wont_change "Rental.count" + must_respond_with :not_found + end + + it "returns not found if it can't find a rental" do + rental_hash = { + rental: { + customer_id: valid_customer.id, + movie_id: movies(:treasure).id, + }, + } + + expect { post check_in_path, params: rental_hash[:rental] }.wont_change "Rental.count" + must_respond_with :not_found + end end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index b3b70b778..71557b98e 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -13,3 +13,10 @@ savior: release_date: 2010-11-05 inventory: 1 available_inventory: 0 + +treasure: + title: "Treasures of Ruby on Rails" + overview: "Something about R on R" + release_date: 2010-11-05 + inventory: 5 + available_inventory: 5 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 5ed2d3b68..3a1fc2a0b 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,13 +1,21 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:rental_one) } + + it "must be valid" do + expect(rental.valid?).must_equal true + end describe "relationships" do it "is only valid if the rental has a customer" do + rental.customer = nil + expect(rental.valid?).must_equal false end it "is only valid if the rental has a movie" do + rental.movie = nil + expect(rental.valid?).must_equal false end end end