From 3e904140077300d8b271d9b9595426a7269a2c71 Mon Sep 17 00:00:00 2001 From: Layla Bristol Date: Mon, 5 Nov 2018 11:31:15 -0800 Subject: [PATCH 01/25] initial rails setup --- .gitignore | 23 ++ .ruby-version | 1 + Gemfile | 45 +++ Gemfile.lock | 150 +++++++++ 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/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 2 + app/controllers/rentals_controller.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 2 + app/models/movie.rb | 2 + app/models/rental.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 | 35 ++ 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 +++ .../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 | 6 + config/spring.rb | 6 + config/storage.yml | 34 ++ db/migrate/20181105193047_create_customers.rb | 8 + db/migrate/20181105193058_create_rentals.rb | 8 + db/migrate/20181105193103_create_movies.rb | 8 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/controllers/customers_controller_test.rb | 7 + test/controllers/movies_controller_test.rb | 7 + test/controllers/rentals_controller_test.rb | 7 + test/fixtures/.keep | 0 test/fixtures/customers.yml | 11 + test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 11 + test/fixtures/rentals.yml | 11 + test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 7 + test/models/movie_test.rb | 7 + test/models/rental_test.rb | 7 + test/test_helper.rb | 10 + tmp/.keep | 0 vendor/.keep | 0 75 files changed, 1004 insertions(+), 300 deletions(-) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.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/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/20181105193047_create_customers.rb create mode 100644 db/migrate/20181105193058_create_rentals.rb create mode 100644 db/migrate/20181105193103_create_movies.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/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_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..e54d447e8 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.4.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..3fd59b80b --- /dev/null +++ b/Gemfile @@ -0,0 +1,45 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.4.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# 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] diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..ef1699db0 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,150 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + arel (9.0.0) + bootsnap (1.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + concurrent-ruby (1.1.1) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.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.1) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + msgpack (1.2.4) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + 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.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + 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.0) + 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) + pg (>= 0.18, < 2.0) + puma (~> 3.11) + rails (~> 5.2.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.4.1p111 + +BUNDLED WITH + 1.16.2 diff --git a/README.md b/README.md index 53ab809c5..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 November 9th**. +* 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 conformance - - The provided smoke tests should pass (see the subfolder) - - Bad data sent to the API should result in an appropriate status code and helpful error -- Test coverage - - Models: All relations, validations, and custom model methods should include at least one positive and one negative test case - - Controllers: Every API endpoint should include at least one positive and one negative test case -- Style and Organization - - Everything we've learned so far about how to design and build a Rails app still applies! +* 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=b283da31-639e-47ce-93e2-a98f0119364b) 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 10-19, sorted by ID -- `GET /customers?sort=name&n=10&p=2`: Customers 10-19, sorted by name - -Of course, adding new features means you should be adding new controller tests to verify them. - -Things to note: -- Sorting by ID is the rails default -- Possible sort fields: - - Customers can be sorted by `name`, `registered_at` and `postal_code` - - Movies can be sorted by `title` and `release_date` - - Overdue rentals can be sorted by `title`, `name`, `checkout_date` and `due_date` -- If the client requests both sorting and pagination, pagination should be relative to the sorted order -- Check out the [will_paginate gem](https://github.com/mislav/will_paginate) - -### More Endpoints: Inventory Management -All these endpoints should support all 3 query parameters. All fields are sortable. - -#### `GET /rentals/overdue` -List all customers with overdue movies - -Fields to return: -- `movie_id` -- `title` -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /movies/:id/current` -List customers that have _currently_ checked out a copy of the film - -URI parameters: -- `id`: Movie identifier - -Fields to return: -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /movies/:id/history` -List customers that have checked out a copy of the film _in the past_ - -URI parameters: -- `id`: Movie identifier - -Fields to return: -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -#### `GET /customers/:id/current` -List the movies a customer _currently_ has checked out - -URI parameters: -- `id`: Customer ID - -Fields to return: -- `title` -- `checkout_date` -- `due_date` - -#### `GET /customers/:id/history` -List the movies a customer has checked out _in the past_ - -URI parameters: -- `id`: Customer ID - -Fields to return: -- `title` -- `checkout_date` -- `due_date` - - -## Reference -- [Postman on Environments](https://www.getpostman.com/docs/environments) - -## What We're Looking For - -Check the [feedback template](./feedback.md) to see how we will evaluate your project. +* ... diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/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/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..7e900705d --- /dev/null +++ b/config/application.rb @@ -0,0 +1,35 @@ +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 + # 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..09efe2aba --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +hYDpAC8MhwLnB5YvCU7/AaGYoR/tHDpQ3nzHCtG3fcQuGbEhbgtGc8oXgMMwcyB5GGq8soAp/rzd1j8qE9XsiLbv8D9f8y/5s0L0u0IpIETCzgsSLqZizrlv+KozL/83JA1tOWq3yZ7GRtSWYg5GphgQ+t/qNOuG7a9mde+J5hpEGCKar74Pc1MMqne9dgleFmg+yWgew4bv3hEFYz14AJLxZasC8a0+yGR7ZVoLX9yCfHVOk6tuWEdJUlDUfiBJnKcNnRSJH+EST4TlSxkpdLavE85WKr/pDg/awqc1MXCRYIfZTZQ4rcjsxLoiwS8LKNlYK38JylHAqzUWYud39MvyHQHCrjkE30Sv4epWlH3QF6lbUG5yx/yCFiQqw6kZIuGduPo/j4fiUpPsmLC9X2cLUeK6ncnGlxFV--ihokTlw83VIWg2oa--cB8vn1a94lTjbH7HlVVg8g== \ 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/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..085ea16ec --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,6 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + get '/customer/zomg', to: 'customer#zomg', as: 'zomg' + +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/20181105193047_create_customers.rb b/db/migrate/20181105193047_create_customers.rb new file mode 100644 index 000000000..21dbca0f6 --- /dev/null +++ b/db/migrate/20181105193047_create_customers.rb @@ -0,0 +1,8 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181105193058_create_rentals.rb b/db/migrate/20181105193058_create_rentals.rb new file mode 100644 index 000000000..328e5f49a --- /dev/null +++ b/db/migrate/20181105193058_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181105193103_create_movies.rb b/db/migrate/20181105193103_create_movies.rb new file mode 100644 index 000000000..a82569703 --- /dev/null +++ b/db/migrate/20181105193103_create_movies.rb @@ -0,0 +1,8 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + + t.timestamps + end + 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/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..0e64081a0 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CustomersControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..10423ecfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class MoviesControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..8b1fc8229 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class RentalsControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..80aed36e3 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..80aed36e3 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..80aed36e3 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..0ec4c76b2 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CustomerTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..22d708468 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class MovieTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..5906fdbc2 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class RentalTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..3ab84e3d1 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +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 75567b5872938721b00a8107064a72d246f20026 Mon Sep 17 00:00:00 2001 From: Layla Bristol Date: Mon, 5 Nov 2018 11:35:33 -0800 Subject: [PATCH 02/25] added routes --- config/routes.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 085ea16ec..1f2ed57b5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,12 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get '/customer/zomg', to: 'customer#zomg', as: 'zomg' - + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] + + get '/rentals/check_in', to: 'rentals#check_in', as: 'check_in' + get '/rentals/check_out', to: 'rentals#check_out', as: 'check_in' + + get '/customers/zomg', to: 'customers#zomg', as: 'zomg' + end From e55ae93f48b9beaa12348119c84c3dfc1195c710 Mon Sep 17 00:00:00 2001 From: Aurea Date: Mon, 5 Nov 2018 11:43:38 -0800 Subject: [PATCH 03/25] add model migrations --- Gemfile | 2 +- Gemfile.lock | 2 +- config/routes.rb | 2 +- db/migrate/20181105193047_create_customers.rb | 7 +++ db/migrate/20181105193058_create_rentals.rb | 5 ++ db/migrate/20181105193103_create_movies.rb | 5 +- db/schema.rb | 50 +++++++++++++++++++ 7 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 db/schema.rb diff --git a/Gemfile b/Gemfile index 3fd59b80b..40c0bb5d8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.4.1' +ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index ef1699db0..202fa7f97 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,7 +144,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION - ruby 2.4.1p111 + ruby 2.5.1p57 BUNDLED WITH 1.16.2 diff --git a/config/routes.rb b/config/routes.rb index 1f2ed57b5..cf56261ad 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,7 @@ resources :movies, only: [:index, :show, :create] get '/rentals/check_in', to: 'rentals#check_in', as: 'check_in' - get '/rentals/check_out', to: 'rentals#check_out', as: 'check_in' + get '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' get '/customers/zomg', to: 'customers#zomg', as: 'zomg' diff --git a/db/migrate/20181105193047_create_customers.rb b/db/migrate/20181105193047_create_customers.rb index 21dbca0f6..bacf35c8f 100644 --- a/db/migrate/20181105193047_create_customers.rb +++ b/db/migrate/20181105193047_create_customers.rb @@ -1,6 +1,13 @@ 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 diff --git a/db/migrate/20181105193058_create_rentals.rb b/db/migrate/20181105193058_create_rentals.rb index 328e5f49a..50d58eab7 100644 --- a/db/migrate/20181105193058_create_rentals.rb +++ b/db/migrate/20181105193058_create_rentals.rb @@ -2,6 +2,11 @@ class CreateRentals < ActiveRecord::Migration[5.2] def change create_table :rentals do |t| + t.date :checkout_date + t.date :due_date + + t.belongs_to :movie, index: true + t.belongs_to :customer, index: true t.timestamps end end diff --git a/db/migrate/20181105193103_create_movies.rb b/db/migrate/20181105193103_create_movies.rb index a82569703..f100f60f8 100644 --- a/db/migrate/20181105193103_create_movies.rb +++ b/db/migrate/20181105193103_create_movies.rb @@ -1,7 +1,10 @@ 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 diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..5dbadc7e5 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,50 @@ +# 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: 2018_11_05_193103) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.date "due_date" + t.bigint "movie_id" + t.bigint "customer_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + +end From ae3fdd220057fc2513edef70a5e0851c9a15322b Mon Sep 17 00:00:00 2001 From: Layla Bristol Date: Mon, 5 Nov 2018 11:48:14 -0800 Subject: [PATCH 04/25] zomg --- app/controllers/customers_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..28c97c8d1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,7 @@ class CustomersController < ApplicationController + + def zomg + render json: { :zomg => "it works"} + end + end From f363d1e10ef9e038f9154975ed6b5824f7458884 Mon Sep 17 00:00:00 2001 From: Aurea Date: Mon, 5 Nov 2018 11:59:27 -0800 Subject: [PATCH 05/25] set model validations --- app/models/customer.rb | 5 +++++ app/models/movie.rb | 6 ++++++ app/models/rental.rb | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..8cfa08aa4 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,7 @@ class Customer < ApplicationRecord + + has_many :rentals + + validates :name, presence: true + end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..3b09bc419 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,8 @@ class Movie < ApplicationRecord + + has_many :rentals + + validates :title, presence: true + validates :inventory, presence: true, numericality: { greater_than_or_equal_to: 0 } + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..d1a778256 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,7 @@ class Rental < ApplicationRecord + + belongs_to :customer + belongs_to :movie + + validates :checkout_date, presence: true end From be7052bf91c03258629e645f188e02d674b5776c Mon Sep 17 00:00:00 2001 From: Layla Bristol Date: Mon, 5 Nov 2018 12:10:28 -0800 Subject: [PATCH 06/25] add index --- app/controllers/customers_controller.rb | 3 +++ db/seeds.rb | 1 + 2 files changed, 4 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 28c97c8d1..524863b27 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,8 @@ class CustomersController < ApplicationController + def index + end + def zomg render json: { :zomg => "it works"} end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..4d50d3ec9 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,3 +1,4 @@ + JSON.parse(File.read('db/seeds/customers.json')).each do |customer| Customer.create!(customer) end From eedaaad27d11985bcad15d020ee77820b1b3b63f Mon Sep 17 00:00:00 2001 From: Aurea Date: Mon, 5 Nov 2018 12:13:23 -0800 Subject: [PATCH 07/25] add show method --- app/controllers/customers_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 524863b27..1c9dc7095 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,10 @@ class CustomersController < ApplicationController def index end - + + def show + end + def zomg render json: { :zomg => "it works"} end From a41e0263a6a39c78a53bc261e938efa6acddebc7 Mon Sep 17 00:00:00 2001 From: Aurea Date: Mon, 5 Nov 2018 12:22:43 -0800 Subject: [PATCH 08/25] set up yml files --- test/fixtures/customers.yml | 10 +++++----- test/fixtures/movies.yml | 16 +++++++++++----- test/fixtures/rentals.yml | 12 +++++++----- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 80aed36e3..ccef44003 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,8 +4,8 @@ # model remove the '{}' from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +layla: + name: layla b + +aurea: + name: aurea l diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 80aed36e3..c961da9d6 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,14 @@ # model remove the '{}' from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +titanic: + title: titanic + inventory: 10 + +jaws: + title: jaws + inventory: 1 + +grease: + title: grease + inventory: 0 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 80aed36e3..29cba07ae 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,10 @@ # model remove the '{}' from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +one: + movie: titanic + customer: layla + +two: + movie: jaws + customer: aurea From 9084a475a824ae782f29cc293130eab0f18bc7c4 Mon Sep 17 00:00:00 2001 From: Aurea Date: Mon, 5 Nov 2018 12:32:41 -0800 Subject: [PATCH 09/25] add tests for customer --- Gemfile | 10 ++++++++ Gemfile.lock | 47 ++++++++++++++++++++++++++++++++++++ test/models/customer_test.rb | 34 +++++++++++++++++++++++--- test/test_helper.rb | 5 ++++ 4 files changed, 92 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 40c0bb5d8..4586a6ad1 100644 --- a/Gemfile +++ b/Gemfile @@ -38,8 +38,18 @@ group :development do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' + end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock index 202fa7f97..a4a0560ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,17 +42,40 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + ansi (1.5.0) arel (9.0.0) + better_errors (2.5.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) bootsnap (1.3.2) msgpack (~> 1.0) builder (3.2.3) byebug (10.0.2) + coderay (1.1.2) concurrent-ruby (1.1.1) crass (1.0.4) + debug_inspector (0.0.3) erubi (1.7.1) ffi (1.9.25) + formatador (0.2.5) globalid (0.4.1) activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) i18n (1.1.1) concurrent-ruby (~> 1.0) listen (3.1.5) @@ -62,6 +85,7 @@ GEM loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) + lumberjack (1.0.13) mail (2.7.1) mini_mime (>= 0.1.1) marcel (0.3.3) @@ -71,11 +95,26 @@ GEM mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar msgpack (1.2.4) + nenv (0.3.0) nio4r (2.3.1) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) pg (1.1.3) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) puma (3.12.0) rack (2.0.5) rack-test (1.1.0) @@ -108,7 +147,9 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) ruby_dep (1.5.0) + shellany (0.0.1) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) @@ -133,9 +174,15 @@ PLATFORMS ruby DEPENDENCIES + better_errors + binding_of_caller bootsnap (>= 1.1.0) byebug + guard + guard-minitest listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters pg (>= 0.18, < 2.0) puma (~> 3.11) rails (~> 5.2.1) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 0ec4c76b2..ab40630ea 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,33 @@ require 'test_helper' -class CustomerTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end +describe Customer do + let (:customer) { + customers(:layla) + } + + describe 'relations' do + it 'has some rentals' do + expect( customer.rentals ).must_respond_to :each + + end + + end + + describe 'validations' do + + it 'is valid when name is present' do + + expect( customer ).must_be :valid? + + end + + it 'is invalid without a name' do + + customer.name = nil + + expect( customer ).wont_be :valid? + + end + + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..14ae70a68 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,11 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' +require 'minitest/rails' +require 'minitest/reporters' +require "pry" + + class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From 7149cb4619c4ba17636eb4fdcbb189be2723e19c Mon Sep 17 00:00:00 2001 From: Layla Bristol Date: Mon, 5 Nov 2018 13:55:01 -0800 Subject: [PATCH 10/25] adding model testing --- Gemfile | 1 + Gemfile.lock | 5 +++- test/fixtures/rentals.yml | 2 ++ test/models/movie_test.rb | 49 ++++++++++++++++++++++++++++++++++---- test/models/rental_test.rb | 38 +++++++++++++++++++++++++---- 5 files changed, 86 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 4586a6ad1..161578f6a 100644 --- a/Gemfile +++ b/Gemfile @@ -31,6 +31,7 @@ gem 'bootsnap', '>= 1.1.0', require: false 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] + gem 'pry-rails' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index a4a0560ce..4ba7f7c65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,6 +115,8 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) puma (3.12.0) rack (2.0.5) rack-test (1.1.0) @@ -184,6 +186,7 @@ DEPENDENCIES minitest-rails minitest-reporters pg (>= 0.18, < 2.0) + pry-rails puma (~> 3.11) rails (~> 5.2.1) spring @@ -194,4 +197,4 @@ RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 1.16.2 + 1.16.6 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 29cba07ae..65b210fa5 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -7,7 +7,9 @@ one: movie: titanic customer: layla + checkout_date: "2018-10-31" two: movie: jaws customer: aurea + checkout_date: "2018-11-13" diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 22d708468..ef3aca900 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,48 @@ require 'test_helper' -class MovieTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end +describe Movie do + let (:movie) { + movies(:titanic) + } + + describe 'relations' do + it 'has some rentals' do + expect( movie.rentals ).must_respond_to :each + + end + + end + + describe 'validations' do + + it 'is valid when name is present' do + + expect( movie ).must_be :valid? + + end + + it 'is invalid without a name' do + + movie.title = nil + + expect( movie ).wont_be :valid? + + end + + it 'is invalid without inventory' do + + movie.inventory = nil + + expect( movie ).wont_be :valid? + end + + it 'is invalid if negative inventory' do + movie.inventory = -1 + + expect( movie ).wont_be :valid? + end + + end + + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 5906fdbc2..80fbd327a 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,37 @@ require 'test_helper' -class RentalTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end +describe Rental do + let (:rental) { + rentals(:one) + } + + describe 'relations' do + + it 'has a customer' do + expect( rental.customer ).must_be_instance_of Customer + + end + + it 'has a movie' do + expect( rental.movie ).must_be_instance_of Movie + + end + + end + + describe 'validations' do + + it 'is valid when checkout_date is present' do + expect( rental ).must_be :valid? + + end + + it 'is invalid when checkout_date is missing' do + rental.checkout_date = nil + expect( rental ).wont_be :valid? + + end + + end + end From 84671b6b6e47ed7a846394374c0537fdf5753515 Mon Sep 17 00:00:00 2001 From: Aurea Date: Mon, 5 Nov 2018 14:08:40 -0800 Subject: [PATCH 11/25] add gem test file --- Gemfile | 1 + Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 4586a6ad1..161578f6a 100644 --- a/Gemfile +++ b/Gemfile @@ -31,6 +31,7 @@ gem 'bootsnap', '>= 1.1.0', require: false 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] + gem 'pry-rails' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index a4a0560ce..9d22d535c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,6 +115,8 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) puma (3.12.0) rack (2.0.5) rack-test (1.1.0) @@ -184,6 +186,7 @@ DEPENDENCIES minitest-rails minitest-reporters pg (>= 0.18, < 2.0) + pry-rails puma (~> 3.11) rails (~> 5.2.1) spring From 02bd949d5241dcad3f17c39ee59b73affd50e6fe Mon Sep 17 00:00:00 2001 From: Layla Bristol Date: Mon, 5 Nov 2018 14:18:22 -0800 Subject: [PATCH 12/25] crud actions for error handling and customer controller --- app/controllers/application_controller.rb | 5 +++++ app/controllers/customers_controller.rb | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..0f9e43ab3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,7 @@ class ApplicationController < ActionController::API + + def render_error(status, errors) + render json: { errors: errors}, status: status + end + end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1c9dc7095..4ea2983ae 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,13 +1,23 @@ class CustomersController < ApplicationController def index + customers = Customer.all + render json: jsonify(customers), status: :ok end - def show - end def zomg render json: { :zomg => "it works"} end +private + #strong params + def customer_params + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + end + + def jsonify(customer_data) + return customer_data.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok + end + end From 59ee6b6df8076e0335a9919aa4b8ba777a739cc8 Mon Sep 17 00:00:00 2001 From: Layla Bristol Date: Mon, 5 Nov 2018 14:21:08 -0800 Subject: [PATCH 13/25] added customer controller test --- test/controllers/customers_controller_test.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 0e64081a0..64f5af58b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,4 +4,18 @@ class CustomersControllerTest < ActionDispatch::IntegrationTest # test "the truth" do # assert true # end + + describe "index" do + # These tests are a little verbose - yours do not need to be + # this explicit. + + it "successfully gets index page" do + get customers_path + must_respond_with :success + end + + end + + + end From 5e362208383838fce064264a91d285c7044c2c3d Mon Sep 17 00:00:00 2001 From: Layla Bristol Date: Mon, 5 Nov 2018 15:10:46 -0800 Subject: [PATCH 14/25] created crud actions for controller --- app/controllers/movies_controller.rb | 35 ++++++++++++++++ test/controllers/customers_controller_test.rb | 7 +--- test/controllers/movies_controller_test.rb | 41 +++++++++++++++++-- 3 files changed, 74 insertions(+), 9 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..3006b3e57 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,37 @@ class MoviesController < ApplicationController + + def index + movies = Movie.all + render json: jsonify(movies), status: :ok + end + + def show + movie_id = params[:id] + movie = Movie.find_by(id: movie_id) + if pet + render json: movie.as_json(only: [:title, :overview, :release_date]), status: :ok + else + render_error(:not_found, {movie_id: ["Movie does not exist."]}) + end + end + + def create + movie = Movie.new(movie_params) + if movie.save + render json: { id: movie.id }, status: :ok + else + render_error(:bad_request, movie.errors.messages) + end + end + +private + #strong params + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end + + def jsonify(movie_data) + return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + end + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 64f5af58b..b84c29aa2 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,15 +1,10 @@ require 'test_helper' class CustomersControllerTest < ActionDispatch::IntegrationTest - # test "the truth" do - # assert true - # end describe "index" do - # These tests are a little verbose - yours do not need to be - # this explicit. - it "successfully gets index page" do + it "successfully gets list of customers" do get customers_path must_respond_with :success end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 10423ecfb..1cb13714d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,42 @@ require 'test_helper' class MoviesControllerTest < ActionDispatch::IntegrationTest - # test "the truth" do - # assert true - # end + + describe "index" do + + it "successfully gets list of movies" do + get movies_path + must_respond_with :success + end + + end + + describe "show" do + let (:movie) { + movies(:titanic) + } + + it "successfully returns valid movie" do + + get movie_path(movie.id) + must_respond_with :success + end + + it 'does not successfully return if invalid movie' + movie.destroy + + get movie_path(movie.id) + must_respond_with :not_found + end + + describe "create" do + + it "successfully creates a new movie" do + + + + end + + it 'does not successfully return if invalid' + end From e293fec604e855f82fddf45adbc8db58c702272d Mon Sep 17 00:00:00 2001 From: Aurea Date: Mon, 5 Nov 2018 15:22:38 -0800 Subject: [PATCH 15/25] remove status ok for show movie --- app/controllers/movies_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3006b3e57..d0ed7cbf7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,8 +8,9 @@ def index def show movie_id = params[:id] movie = Movie.find_by(id: movie_id) - if pet - render json: movie.as_json(only: [:title, :overview, :release_date]), status: :ok + + if movie + render json: jsonify(movie) else render_error(:not_found, {movie_id: ["Movie does not exist."]}) end @@ -31,7 +32,7 @@ def movie_params end def jsonify(movie_data) - return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]) end end From 5100f1eaf4083a9bbecf11d3d59d48e3a415f207 Mon Sep 17 00:00:00 2001 From: Aurea Date: Mon, 5 Nov 2018 15:56:03 -0800 Subject: [PATCH 16/25] add rental seeds --- Gemfile | 2 ++ Gemfile.lock | 3 +++ app/controllers/movies_controller.rb | 2 +- db/generate_seeds.rb | 20 ++++++++++++++++++++ db/seeds.rb | 21 +++++++++++++++++++++ db/seeds/rentals.json | 1 + 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 db/generate_seeds.rb create mode 100644 db/seeds/rentals.json diff --git a/Gemfile b/Gemfile index 161578f6a..343d6a622 100644 --- a/Gemfile +++ b/Gemfile @@ -54,3 +54,5 @@ group :test do gem 'minitest-rails' gem 'minitest-reporters' end + +gem 'faker' diff --git a/Gemfile.lock b/Gemfile.lock index 4ba7f7c65..dd814479b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,6 +59,8 @@ GEM crass (1.0.4) debug_inspector (0.0.3) erubi (1.7.1) + faker (1.9.1) + i18n (>= 0.7) ffi (1.9.25) formatador (0.2.5) globalid (0.4.1) @@ -180,6 +182,7 @@ DEPENDENCIES binding_of_caller bootsnap (>= 1.1.0) byebug + faker guard guard-minitest listen (>= 3.0.5, < 3.2) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d0ed7cbf7..6b2bacf9a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,7 @@ def index def show movie_id = params[:id] movie = Movie.find_by(id: movie_id) - + if movie render json: jsonify(movie) else diff --git a/db/generate_seeds.rb b/db/generate_seeds.rb new file mode 100644 index 000000000..11cf18a85 --- /dev/null +++ b/db/generate_seeds.rb @@ -0,0 +1,20 @@ +require 'faker' +require 'pry' + +binding.pry +rental_json = [] +5.times do + rental = { + "checkout_date": Faker::Date.backward(14), + "due_date": Faker::Date.forward(14), + "movie_id": rand(Movie.count) + 1, + "customer_id": rand(Customer.count) + 1 + } + + rental_json << rental + +end + +File.open("db/seeds/rentals.json","w") do |f| + f.write(rental_json.to_json) +end diff --git a/db/seeds.rb b/db/seeds.rb index 4d50d3ec9..071772749 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,3 +1,4 @@ +require 'faker' JSON.parse(File.read('db/seeds/customers.json')).each do |customer| Customer.create!(customer) @@ -6,3 +7,23 @@ JSON.parse(File.read('db/seeds/movies.json')).each do |movie| Movie.create!(movie) end + +rental_json = [] +50.times do + rental = { + "checkout_date": Faker::Date.backward(14), + "due_date": Faker::Date.forward(14), + "movie_id": rand(Movie.count) + 1, + "customer_id": rand(Customer.count) + 1 + } + + rental_json << rental +end + +File.open("db/seeds/rentals.json","w") do |f| + f.write(rental_json.to_json) +end + +JSON.parse(File.read('db/seeds/rentals.json')).each do |rental| + Rental.create!(rental) +end diff --git a/db/seeds/rentals.json b/db/seeds/rentals.json new file mode 100644 index 000000000..42ff40cd1 --- /dev/null +++ b/db/seeds/rentals.json @@ -0,0 +1 @@ +[{"checkout_date":"2018-10-27","due_date":"2018-11-14","movie_id":79,"customer_id":70},{"checkout_date":"2018-10-23","due_date":"2018-11-10","movie_id":35,"customer_id":56},{"checkout_date":"2018-11-03","due_date":"2018-11-14","movie_id":88,"customer_id":68},{"checkout_date":"2018-11-02","due_date":"2018-11-13","movie_id":4,"customer_id":196},{"checkout_date":"2018-10-27","due_date":"2018-11-08","movie_id":66,"customer_id":9},{"checkout_date":"2018-10-31","due_date":"2018-11-07","movie_id":82,"customer_id":152},{"checkout_date":"2018-10-26","due_date":"2018-11-13","movie_id":46,"customer_id":193},{"checkout_date":"2018-10-28","due_date":"2018-11-06","movie_id":11,"customer_id":15},{"checkout_date":"2018-11-02","due_date":"2018-11-09","movie_id":10,"customer_id":194},{"checkout_date":"2018-10-28","due_date":"2018-11-13","movie_id":50,"customer_id":123},{"checkout_date":"2018-10-23","due_date":"2018-11-14","movie_id":68,"customer_id":28},{"checkout_date":"2018-10-29","due_date":"2018-11-07","movie_id":44,"customer_id":154},{"checkout_date":"2018-11-04","due_date":"2018-11-06","movie_id":57,"customer_id":161},{"checkout_date":"2018-11-01","due_date":"2018-11-18","movie_id":3,"customer_id":98},{"checkout_date":"2018-10-29","due_date":"2018-11-06","movie_id":69,"customer_id":199},{"checkout_date":"2018-10-30","due_date":"2018-11-14","movie_id":49,"customer_id":90},{"checkout_date":"2018-10-22","due_date":"2018-11-13","movie_id":67,"customer_id":183},{"checkout_date":"2018-10-28","due_date":"2018-11-19","movie_id":84,"customer_id":157},{"checkout_date":"2018-10-24","due_date":"2018-11-11","movie_id":43,"customer_id":1},{"checkout_date":"2018-10-22","due_date":"2018-11-19","movie_id":48,"customer_id":78},{"checkout_date":"2018-10-27","due_date":"2018-11-18","movie_id":6,"customer_id":179},{"checkout_date":"2018-10-29","due_date":"2018-11-11","movie_id":30,"customer_id":155},{"checkout_date":"2018-10-25","due_date":"2018-11-16","movie_id":12,"customer_id":85},{"checkout_date":"2018-10-24","due_date":"2018-11-12","movie_id":64,"customer_id":170},{"checkout_date":"2018-10-27","due_date":"2018-11-17","movie_id":41,"customer_id":81},{"checkout_date":"2018-11-04","due_date":"2018-11-09","movie_id":41,"customer_id":119},{"checkout_date":"2018-10-28","due_date":"2018-11-07","movie_id":82,"customer_id":26},{"checkout_date":"2018-10-28","due_date":"2018-11-07","movie_id":54,"customer_id":71},{"checkout_date":"2018-10-22","due_date":"2018-11-07","movie_id":11,"customer_id":147},{"checkout_date":"2018-11-04","due_date":"2018-11-11","movie_id":90,"customer_id":1},{"checkout_date":"2018-10-22","due_date":"2018-11-17","movie_id":17,"customer_id":146},{"checkout_date":"2018-10-22","due_date":"2018-11-10","movie_id":32,"customer_id":119},{"checkout_date":"2018-10-23","due_date":"2018-11-11","movie_id":60,"customer_id":60},{"checkout_date":"2018-10-29","due_date":"2018-11-11","movie_id":79,"customer_id":64},{"checkout_date":"2018-10-30","due_date":"2018-11-13","movie_id":70,"customer_id":95},{"checkout_date":"2018-10-25","due_date":"2018-11-13","movie_id":24,"customer_id":181},{"checkout_date":"2018-10-22","due_date":"2018-11-08","movie_id":72,"customer_id":93},{"checkout_date":"2018-10-22","due_date":"2018-11-09","movie_id":46,"customer_id":48},{"checkout_date":"2018-10-27","due_date":"2018-11-09","movie_id":43,"customer_id":28},{"checkout_date":"2018-10-23","due_date":"2018-11-16","movie_id":45,"customer_id":8},{"checkout_date":"2018-10-25","due_date":"2018-11-19","movie_id":65,"customer_id":76},{"checkout_date":"2018-10-22","due_date":"2018-11-08","movie_id":15,"customer_id":171},{"checkout_date":"2018-11-01","due_date":"2018-11-11","movie_id":26,"customer_id":53},{"checkout_date":"2018-10-22","due_date":"2018-11-07","movie_id":52,"customer_id":157},{"checkout_date":"2018-10-30","due_date":"2018-11-15","movie_id":72,"customer_id":72},{"checkout_date":"2018-10-22","due_date":"2018-11-16","movie_id":42,"customer_id":102},{"checkout_date":"2018-11-03","due_date":"2018-11-16","movie_id":54,"customer_id":144},{"checkout_date":"2018-11-01","due_date":"2018-11-19","movie_id":81,"customer_id":153},{"checkout_date":"2018-11-04","due_date":"2018-11-19","movie_id":66,"customer_id":67},{"checkout_date":"2018-10-25","due_date":"2018-11-14","movie_id":38,"customer_id":75}] \ No newline at end of file From d4ca2c6250e1f7fd54017390e3ba73298cb37607 Mon Sep 17 00:00:00 2001 From: Aurea Date: Tue, 6 Nov 2018 11:53:03 -0800 Subject: [PATCH 17/25] add movie controller tests --- db/generate_seeds.rb | 20 ----- db/seeds/rentals.json | 2 +- test/controllers/movies_controller_test.rb | 85 +++++++++++++++++++--- 3 files changed, 76 insertions(+), 31 deletions(-) delete mode 100644 db/generate_seeds.rb diff --git a/db/generate_seeds.rb b/db/generate_seeds.rb deleted file mode 100644 index 11cf18a85..000000000 --- a/db/generate_seeds.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'faker' -require 'pry' - -binding.pry -rental_json = [] -5.times do - rental = { - "checkout_date": Faker::Date.backward(14), - "due_date": Faker::Date.forward(14), - "movie_id": rand(Movie.count) + 1, - "customer_id": rand(Customer.count) + 1 - } - - rental_json << rental - -end - -File.open("db/seeds/rentals.json","w") do |f| - f.write(rental_json.to_json) -end diff --git a/db/seeds/rentals.json b/db/seeds/rentals.json index 42ff40cd1..0937ca93e 100644 --- a/db/seeds/rentals.json +++ b/db/seeds/rentals.json @@ -1 +1 @@ -[{"checkout_date":"2018-10-27","due_date":"2018-11-14","movie_id":79,"customer_id":70},{"checkout_date":"2018-10-23","due_date":"2018-11-10","movie_id":35,"customer_id":56},{"checkout_date":"2018-11-03","due_date":"2018-11-14","movie_id":88,"customer_id":68},{"checkout_date":"2018-11-02","due_date":"2018-11-13","movie_id":4,"customer_id":196},{"checkout_date":"2018-10-27","due_date":"2018-11-08","movie_id":66,"customer_id":9},{"checkout_date":"2018-10-31","due_date":"2018-11-07","movie_id":82,"customer_id":152},{"checkout_date":"2018-10-26","due_date":"2018-11-13","movie_id":46,"customer_id":193},{"checkout_date":"2018-10-28","due_date":"2018-11-06","movie_id":11,"customer_id":15},{"checkout_date":"2018-11-02","due_date":"2018-11-09","movie_id":10,"customer_id":194},{"checkout_date":"2018-10-28","due_date":"2018-11-13","movie_id":50,"customer_id":123},{"checkout_date":"2018-10-23","due_date":"2018-11-14","movie_id":68,"customer_id":28},{"checkout_date":"2018-10-29","due_date":"2018-11-07","movie_id":44,"customer_id":154},{"checkout_date":"2018-11-04","due_date":"2018-11-06","movie_id":57,"customer_id":161},{"checkout_date":"2018-11-01","due_date":"2018-11-18","movie_id":3,"customer_id":98},{"checkout_date":"2018-10-29","due_date":"2018-11-06","movie_id":69,"customer_id":199},{"checkout_date":"2018-10-30","due_date":"2018-11-14","movie_id":49,"customer_id":90},{"checkout_date":"2018-10-22","due_date":"2018-11-13","movie_id":67,"customer_id":183},{"checkout_date":"2018-10-28","due_date":"2018-11-19","movie_id":84,"customer_id":157},{"checkout_date":"2018-10-24","due_date":"2018-11-11","movie_id":43,"customer_id":1},{"checkout_date":"2018-10-22","due_date":"2018-11-19","movie_id":48,"customer_id":78},{"checkout_date":"2018-10-27","due_date":"2018-11-18","movie_id":6,"customer_id":179},{"checkout_date":"2018-10-29","due_date":"2018-11-11","movie_id":30,"customer_id":155},{"checkout_date":"2018-10-25","due_date":"2018-11-16","movie_id":12,"customer_id":85},{"checkout_date":"2018-10-24","due_date":"2018-11-12","movie_id":64,"customer_id":170},{"checkout_date":"2018-10-27","due_date":"2018-11-17","movie_id":41,"customer_id":81},{"checkout_date":"2018-11-04","due_date":"2018-11-09","movie_id":41,"customer_id":119},{"checkout_date":"2018-10-28","due_date":"2018-11-07","movie_id":82,"customer_id":26},{"checkout_date":"2018-10-28","due_date":"2018-11-07","movie_id":54,"customer_id":71},{"checkout_date":"2018-10-22","due_date":"2018-11-07","movie_id":11,"customer_id":147},{"checkout_date":"2018-11-04","due_date":"2018-11-11","movie_id":90,"customer_id":1},{"checkout_date":"2018-10-22","due_date":"2018-11-17","movie_id":17,"customer_id":146},{"checkout_date":"2018-10-22","due_date":"2018-11-10","movie_id":32,"customer_id":119},{"checkout_date":"2018-10-23","due_date":"2018-11-11","movie_id":60,"customer_id":60},{"checkout_date":"2018-10-29","due_date":"2018-11-11","movie_id":79,"customer_id":64},{"checkout_date":"2018-10-30","due_date":"2018-11-13","movie_id":70,"customer_id":95},{"checkout_date":"2018-10-25","due_date":"2018-11-13","movie_id":24,"customer_id":181},{"checkout_date":"2018-10-22","due_date":"2018-11-08","movie_id":72,"customer_id":93},{"checkout_date":"2018-10-22","due_date":"2018-11-09","movie_id":46,"customer_id":48},{"checkout_date":"2018-10-27","due_date":"2018-11-09","movie_id":43,"customer_id":28},{"checkout_date":"2018-10-23","due_date":"2018-11-16","movie_id":45,"customer_id":8},{"checkout_date":"2018-10-25","due_date":"2018-11-19","movie_id":65,"customer_id":76},{"checkout_date":"2018-10-22","due_date":"2018-11-08","movie_id":15,"customer_id":171},{"checkout_date":"2018-11-01","due_date":"2018-11-11","movie_id":26,"customer_id":53},{"checkout_date":"2018-10-22","due_date":"2018-11-07","movie_id":52,"customer_id":157},{"checkout_date":"2018-10-30","due_date":"2018-11-15","movie_id":72,"customer_id":72},{"checkout_date":"2018-10-22","due_date":"2018-11-16","movie_id":42,"customer_id":102},{"checkout_date":"2018-11-03","due_date":"2018-11-16","movie_id":54,"customer_id":144},{"checkout_date":"2018-11-01","due_date":"2018-11-19","movie_id":81,"customer_id":153},{"checkout_date":"2018-11-04","due_date":"2018-11-19","movie_id":66,"customer_id":67},{"checkout_date":"2018-10-25","due_date":"2018-11-14","movie_id":38,"customer_id":75}] \ No newline at end of file +[{"checkout_date":"2018-10-27","due_date":"2018-11-14","movie_id":79,"customer_id":70},{"checkout_date":"2018-10-23","due_date":"2018-11-10","movie_id":35,"customer_id":56},{"checkout_date":"2018-11-03","due_date":"2018-11-14","movie_id":88,"customer_id":68},{"checkout_date":"2018-11-02","due_date":"2018-11-13","movie_id":4,"customer_id":196},{"checkout_date":"2018-10-27","due_date":"2018-11-08","movie_id":66,"customer_id":9},{"checkout_date":"2018-10-31","due_date":"2018-11-07","movie_id":82,"customer_id":152},{"checkout_date":"2018-10-26","due_date":"2018-11-13","movie_id":46,"customer_id":193},{"checkout_date":"2018-10-28","due_date":"2018-11-06","movie_id":11,"customer_id":15},{"checkout_date":"2018-11-02","due_date":"2018-11-09","movie_id":10,"customer_id":194},{"checkout_date":"2018-10-28","due_date":"2018-11-13","movie_id":50,"customer_id":123},{"checkout_date":"2018-10-23","due_date":"2018-11-14","movie_id":68,"customer_id":28},{"checkout_date":"2018-10-29","due_date":"2018-11-07","movie_id":44,"customer_id":154},{"checkout_date":"2018-11-04","due_date":"2018-11-06","movie_id":57,"customer_id":161},{"checkout_date":"2018-11-01","due_date":"2018-11-18","movie_id":3,"customer_id":98},{"checkout_date":"2018-10-29","due_date":"2018-11-06","movie_id":69,"customer_id":199},{"checkout_date":"2018-10-30","due_date":"2018-11-14","movie_id":49,"customer_id":90},{"checkout_date":"2018-10-22","due_date":"2018-11-13","movie_id":67,"customer_id":183},{"checkout_date":"2018-10-28","due_date":"2018-11-19","movie_id":84,"customer_id":157},{"checkout_date":"2018-10-24","due_date":"2018-11-11","movie_id":43,"customer_id":1},{"checkout_date":"2018-10-22","due_date":"2018-11-19","movie_id":48,"customer_id":78},{"checkout_date":"2018-10-27","due_date":"2018-11-18","movie_id":6,"customer_id":179},{"checkout_date":"2018-10-29","due_date":"2018-11-11","movie_id":30,"customer_id":155},{"checkout_date":"2018-10-25","due_date":"2018-11-16","movie_id":12,"customer_id":85},{"checkout_date":"2018-10-24","due_date":"2018-11-12","movie_id":64,"customer_id":170},{"checkout_date":"2018-10-27","due_date":"2018-11-17","movie_id":41,"customer_id":81},{"checkout_date":"2018-11-04","due_date":"2018-11-09","movie_id":41,"customer_id":119},{"checkout_date":"2018-10-28","due_date":"2018-11-07","movie_id":82,"customer_id":26},{"checkout_date":"2018-10-28","due_date":"2018-11-07","movie_id":54,"customer_id":71},{"checkout_date":"2018-10-22","due_date":"2018-11-07","movie_id":11,"customer_id":147},{"checkout_date":"2018-11-04","due_date":"2018-11-11","movie_id":90,"customer_id":1},{"checkout_date":"2018-10-22","due_date":"2018-11-17","movie_id":17,"customer_id":146},{"checkout_date":"2018-10-22","due_date":"2018-11-10","movie_id":32,"customer_id":119},{"checkout_date":"2018-10-23","due_date":"2018-11-11","movie_id":60,"customer_id":60},{"checkout_date":"2018-10-29","due_date":"2018-11-11","movie_id":79,"customer_id":64},{"checkout_date":"2018-10-30","due_date":"2018-11-13","movie_id":70,"customer_id":95},{"checkout_date":"2018-10-25","due_date":"2018-11-13","movie_id":24,"customer_id":181},{"checkout_date":"2018-10-22","due_date":"2018-11-08","movie_id":72,"customer_id":93},{"checkout_date":"2018-10-22","due_date":"2018-11-09","movie_id":46,"customer_id":48},{"checkout_date":"2018-10-27","due_date":"2018-11-09","movie_id":43,"customer_id":28},{"checkout_date":"2018-10-23","due_date":"2018-11-16","movie_id":45,"customer_id":8},{"checkout_date":"2018-10-25","due_date":"2018-11-19","movie_id":65,"customer_id":76},{"checkout_date":"2018-10-22","due_date":"2018-11-08","movie_id":15,"customer_id":171},{"checkout_date":"2018-11-01","due_date":"2018-11-11","movie_id":26,"customer_id":53},{"checkout_date":"2018-10-22","due_date":"2018-11-07","movie_id":52,"customer_id":157},{"checkout_date":"2018-10-30","due_date":"2018-11-15","movie_id":72,"customer_id":72},{"checkout_date":"2018-10-22","due_date":"2018-11-16","movie_id":42,"customer_id":102},{"checkout_date":"2018-11-03","due_date":"2018-11-16","movie_id":54,"customer_id":144},{"checkout_date":"2018-11-01","due_date":"2018-11-19","movie_id":81,"customer_id":153},{"checkout_date":"2018-11-04","due_date":"2018-11-19","movie_id":66,"customer_id":67},{"checkout_date":"2018-10-25","due_date":"2018-11-14","movie_id":38,"customer_id":75}] diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 1cb13714d..21b9d1de5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,14 +1,39 @@ require 'test_helper' -class MoviesControllerTest < ActionDispatch::IntegrationTest +describe MoviesController do + MOVIE_FIELDS = %w(title overview release_date inventory).sort + + def parse_body(expected_type:, expected_status: :success) + must_respond_with expected_status + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + + expect(body).must_be_kind_of expected_type + return body + end describe "index" do it "successfully gets list of movies" do get movies_path - must_respond_with :success + + body = parse_body(expected_type: Array) + + body.each do |movie| + expect(movie.keys.sort).must_equal MOVIE_FIELDS + end end + it "returns an empty array when there are no movies" do + Movie.destroy_all + + get movies_path + + body = parse_body(expected_type: Array) + + expect(body).must_equal [] + end end describe "show" do @@ -19,24 +44,64 @@ class MoviesControllerTest < ActionDispatch::IntegrationTest it "successfully returns valid movie" do get movie_path(movie.id) - must_respond_with :success + + body = parse_body(expected_type: Hash) + expect(body.keys.sort).must_equal MOVIE_FIELDS end - it 'does not successfully return if invalid movie' + it 'does not successfully return if invalid movie' do + movie.destroy get movie_path(movie.id) - must_respond_with :not_found + + body = parse_body(expected_type: Hash, expected_status: :not_found) + + expect(body).must_include "errors" end - describe "create" do + describe "create" do - it "successfully creates a new movie" do + let (:movie_data) { + { + movie: { + title: "test movie", + inventory: 10 + } + } + } - + it "successfully creates a new movie" do + expect { + post movies_path, params: movie_data + }.must_change('Movie.count', +1) - end + body = parse_body(expected_type: Hash) + + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:movie][:title] + + + end - it 'does not successfully return if invalid' + it 'does not successfully return if invalid' do + movie_data[:movie][:title] = nil + + expect { + post movies_path, params: movie_data + }.wont_change('Movie.count') + + body = parse_body(expected_type: Hash, expected_status: :bad_request) + + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + + end + + end + end end From 79d9f01af0fca3ca2d90c3662a9431e9dbf0af86 Mon Sep 17 00:00:00 2001 From: Aurea Date: Tue, 6 Nov 2018 11:56:46 -0800 Subject: [PATCH 18/25] add customer tests --- app/controllers/customers_controller.rb | 8 +++---- test/controllers/customers_controller_test.rb | 21 +++++++++++++++++-- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 4ea2983ae..8b84948c4 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -6,9 +6,9 @@ def index end - def zomg - render json: { :zomg => "it works"} - end + # def zomg + # render json: { :zomg => "it works"} + # end private #strong params @@ -17,7 +17,7 @@ def customer_params end def jsonify(customer_data) - return customer_data.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok + return customer_data.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b84c29aa2..37b2de97e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,12 +1,29 @@ require 'test_helper' -class CustomersControllerTest < ActionDispatch::IntegrationTest +describe CustomersController do + CUSTOMER_FIELDS = %w(name registered_at address city state postal_code phone).sort + + def parse_body(expected_type:, expected_status: :success) + must_respond_with expected_status + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + + expect(body).must_be_kind_of expected_type + return body + end describe "index" do it "successfully gets list of customers" do get customers_path - must_respond_with :success + + body = parse_body(expected_type: Array) + + body.each do |customer| + + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end end end From efe637735df7b1222410d522b695c48c63d96091 Mon Sep 17 00:00:00 2001 From: Layla Bristol Date: Tue, 6 Nov 2018 12:22:38 -0800 Subject: [PATCH 19/25] added checkout for rental and post route --- app/controllers/rentals_controller.rb | 26 ++++++++++++++++++++++++++ config/routes.rb | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..b90924b20 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,28 @@ class RentalsController < ApplicationController + + #creating a rental + def check_out + rental = Rental.new(rental_params) + rental.update(checkout_date: Time.now.strftime("%Y/%m/%d"), due_date: Time.now + (60 * 60 * 24 * 7)) + + if rental.save + render json: { id: rental.id }, status: :ok + else + render_error(:bad_request, rental.errors.messages) + end + end + + def check_in + end + +private +#strong params + def rental_params + params.require(:rental).permit(:movie_id, :customer_id) + end + + def jsonify(rental_data) + return rental_data.as_json(only: [:checkout_date, :due_date, :movie_id, :customer_id]) + end + end diff --git a/config/routes.rb b/config/routes.rb index cf56261ad..40f0ad9f0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,7 @@ resources :movies, only: [:index, :show, :create] get '/rentals/check_in', to: 'rentals#check_in', as: 'check_in' - get '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' + post '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' get '/customers/zomg', to: 'customers#zomg', as: 'zomg' From 21cfaba23ed015f7c8ac121ddc2da3dd7b7d661a Mon Sep 17 00:00:00 2001 From: Aurea Date: Tue, 6 Nov 2018 15:27:03 -0800 Subject: [PATCH 20/25] change column to return date, add controller tests for check out --- app/controllers/rentals_controller.rb | 20 +++++-- app/models/rental.rb | 1 - config/routes.rb | 2 +- ...0181106222806_rename_checkout_to_return.rb | 5 ++ db/schema.rb | 4 +- test/controllers/rentals_controller_test.rb | 52 +++++++++++++++++-- test/fixtures/rentals.yml | 4 +- 7 files changed, 73 insertions(+), 15 deletions(-) create mode 100644 db/migrate/20181106222806_rename_checkout_to_return.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b90924b20..9f99df151 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,9 @@ class RentalsController < ApplicationController - #creating a rental + # creating a rental def check_out rental = Rental.new(rental_params) - rental.update(checkout_date: Time.now.strftime("%Y/%m/%d"), due_date: Time.now + (60 * 60 * 24 * 7)) + rental.due_date = (Time.now + (60 * 60 * 24 * 7)) if rental.save render json: { id: rental.id }, status: :ok @@ -12,17 +12,27 @@ def check_out end end + # returning a rental def check_in + rental = Rental.find_by(rental_params) + + if rental + rental.update(return_date: Time.now ) + render json: { id: rental.id }, status: :ok + else + render_error(:not_found, { rental_id: ["Rental not found"] }) + end end -private -#strong params + + private + #strong params def rental_params params.require(:rental).permit(:movie_id, :customer_id) end def jsonify(rental_data) - return rental_data.as_json(only: [:checkout_date, :due_date, :movie_id, :customer_id]) + return rental_data.as_json(only: [:return_date, :due_date, :movie_id, :customer_id]) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index d1a778256..1550b75c4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,5 +3,4 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie - validates :checkout_date, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 40f0ad9f0..01560cc76 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,8 +4,8 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - get '/rentals/check_in', to: 'rentals#check_in', as: 'check_in' post '/rentals/check_out', to: 'rentals#check_out', as: 'check_out' + post '/rentals/check_in', to: 'rentals#check_in', as: 'check_in' get '/customers/zomg', to: 'customers#zomg', as: 'zomg' diff --git a/db/migrate/20181106222806_rename_checkout_to_return.rb b/db/migrate/20181106222806_rename_checkout_to_return.rb new file mode 100644 index 000000000..a5160fe94 --- /dev/null +++ b/db/migrate/20181106222806_rename_checkout_to_return.rb @@ -0,0 +1,5 @@ +class RenameCheckoutToReturn < ActiveRecord::Migration[5.2] + def change + rename_column :rentals, :checkout_date, :return_date + end +end diff --git a/db/schema.rb b/db/schema.rb index 5dbadc7e5..163492141 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: 2018_11_05_193103) do +ActiveRecord::Schema.define(version: 2018_11_06_222806) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,7 +37,7 @@ end create_table "rentals", force: :cascade do |t| - t.date "checkout_date" + t.date "return_date" t.date "due_date" t.bigint "movie_id" t.bigint "customer_id" diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8b1fc8229..996c8ee21 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,51 @@ require 'test_helper' -class RentalsControllerTest < ActionDispatch::IntegrationTest - # test "the truth" do - # assert true - # end +describe RentalsController do + + def parse_body(expected_type:, expected_status: :success) + must_respond_with expected_status + + expect(response.header['Content-Type']).must_include 'json' + body = JSON.parse(response.body) + + expect(body).must_be_kind_of expected_type + return body + end + + let (:rental_data) { + { + rental: { + movie_id: Movie.first.id, + customer_id: Customer.first.id + } + } + } + + describe "check out" do + it "successfully creates new rental" do + + expect{ + post check_out_path, params: rental_data + }.must_change('Rental.count', +1) + + body = parse_body(expected_type: Hash) + + expect(body).must_include "id" + + end + + it "does not successfully create if invalid" do + + movie = Movie.find_by(id: rental_data[:rental][:movie_id] ) + movie.destroy + + expect{ + post check_out_path, params: rental_data + }.wont_change('Rental.count') + + body = parse_body(expected_type: Hash, expected_status: :bad_request) + + expect(body).must_include "errors" + end + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 65b210fa5..13c09d8b3 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -7,9 +7,9 @@ one: movie: titanic customer: layla - checkout_date: "2018-10-31" + due_date: "2018-10-31" two: movie: jaws customer: aurea - checkout_date: "2018-11-13" + due_date: "2018-11-13" From 426d8b00a4cbe0d0ea49252ec81ca4e911f1c4cf Mon Sep 17 00:00:00 2001 From: Aurea Date: Tue, 6 Nov 2018 15:54:52 -0800 Subject: [PATCH 21/25] add rental controller test for check in --- test/controllers/rentals_controller_test.rb | 37 +++++++++++++++++++++ test/models/rental_test.rb | 15 --------- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 996c8ee21..23d721d81 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -48,4 +48,41 @@ def parse_body(expected_type:, expected_status: :success) expect(body).must_include "errors" end end + + describe "check in" do + + before do + @rental = rentals(:one) + + @existing_rental = { + rental: { + movie_id: @rental.movie.id, + customer_id: @rental.customer.id + } + } + end + it "successfully updates rental with return date" do + + + expect(@rental.return_date).must_be_nil + post check_in_path, params: @existing_rental + + body = parse_body(expected_type: Hash) + expect(body).must_include "id" + @rental.reload + expect(@rental.return_date.strftime("%m/%d/%Y")).must_equal Time.now.strftime("%m/%d/%Y") + + end + + it "does not successfully update if invalid" do + + @rental.destroy + + post check_in_path, params: @existing_rental + + body = parse_body(expected_type: Hash, expected_status: :not_found) + expect(body).must_include "errors" + + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 80fbd327a..298eec032 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -19,19 +19,4 @@ end - describe 'validations' do - - it 'is valid when checkout_date is present' do - expect( rental ).must_be :valid? - - end - - it 'is invalid when checkout_date is missing' do - rental.checkout_date = nil - expect( rental ).wont_be :valid? - - end - - end - end From c10d82d89b31b5be0f14c2f03305b9cdf805fc82 Mon Sep 17 00:00:00 2001 From: Layla Bristol Date: Tue, 6 Nov 2018 16:38:44 -0800 Subject: [PATCH 22/25] added additional methods for available inventory and movie count --- app/controllers/customers_controller.rb | 7 ++++++- app/controllers/movies_controller.rb | 5 +++-- app/models/customer.rb | 4 ++++ app/models/movie.rb | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 8b84948c4..0716b5f20 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -17,7 +17,12 @@ def customer_params end def jsonify(customer_data) - return customer_data.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone]) + customer_list = customer_data.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone], :methods => :movies_checked_out_count) + + # # customer_list.each do |customer| + # # customer.merge({"movies_checked_out_count": Customer.find_by(id: customer["id"]).movies_checked_out_count}) + # # end + # # return customer_list end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6b2bacf9a..6e8414acd 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,7 @@ def index def show movie_id = params[:id] movie = Movie.find_by(id: movie_id) - + if movie render json: jsonify(movie) else @@ -32,7 +32,8 @@ def movie_params end def jsonify(movie_data) - return movie_data.as_json(only: [:title, :overview, :release_date, :inventory]) + movie_list = movie_data.as_json(only: [:id, :title, :overview, :release_date, :inventory], :methods => :available_inventory) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 8cfa08aa4..03bd16738 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -4,4 +4,8 @@ class Customer < ApplicationRecord validates :name, presence: true + def movies_checked_out_count + return 0 + end + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 3b09bc419..569fdf552 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,4 +5,9 @@ class Movie < ApplicationRecord validates :title, presence: true validates :inventory, presence: true, numericality: { greater_than_or_equal_to: 0 } + def available_inventory + return 0 + end + + end From a58bf4310ff750df4275832d854d84ab7550afd3 Mon Sep 17 00:00:00 2001 From: Aurea Date: Wed, 7 Nov 2018 09:56:43 -0800 Subject: [PATCH 23/25] fix tests for wave 2 and 3, add model methods, remove rental seeds --- app/controllers/customers_controller.rb | 4 --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 6 ++-- app/models/customer.rb | 2 +- app/models/movie.rb | 4 +-- config/routes.rb | 4 +-- db/seeds.rb | 38 ++++++++++++------------- 7 files changed, 28 insertions(+), 32 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0716b5f20..be634b575 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -19,10 +19,6 @@ def customer_params def jsonify(customer_data) customer_list = customer_data.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone], :methods => :movies_checked_out_count) - # # customer_list.each do |customer| - # # customer.merge({"movies_checked_out_count": Customer.find_by(id: customer["id"]).movies_checked_out_count}) - # # end - # # return customer_list end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6e8414acd..8351b0ee3 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -28,7 +28,7 @@ def create private #strong params def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end def jsonify(movie_data) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9f99df151..d5d79407e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,6 +2,7 @@ class RentalsController < ApplicationController # creating a rental def check_out + rental = Rental.new(rental_params) rental.due_date = (Time.now + (60 * 60 * 24 * 7)) @@ -20,7 +21,7 @@ def check_in rental.update(return_date: Time.now ) render json: { id: rental.id }, status: :ok else - render_error(:not_found, { rental_id: ["Rental not found"] }) + render_error(:not_found, { rental_id: ["rental not found"] }) end end @@ -28,7 +29,8 @@ def check_in private #strong params def rental_params - params.require(:rental).permit(:movie_id, :customer_id) + params.permit(:movie_id, :customer_id) + end def jsonify(rental_data) diff --git a/app/models/customer.rb b/app/models/customer.rb index 03bd16738..9041d6453 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,7 +5,7 @@ class Customer < ApplicationRecord validates :name, presence: true def movies_checked_out_count - return 0 + return self.rentals.count{ |rental| rental.return_date.nil? } end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 569fdf552..82d8c805b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,8 +6,6 @@ class Movie < ApplicationRecord validates :inventory, presence: true, numericality: { greater_than_or_equal_to: 0 } def available_inventory - return 0 + return self.inventory - self.rentals.count{ |rental| rental.return_date.nil? } end - - end diff --git a/config/routes.rb b/config/routes.rb index 01560cc76..957f0763b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,8 +4,8 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - 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', to: 'rentals#check_out', as: 'check_out' + post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' get '/customers/zomg', to: 'customers#zomg', as: 'zomg' diff --git a/db/seeds.rb b/db/seeds.rb index 071772749..9b4bbf1aa 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -8,22 +8,22 @@ Movie.create!(movie) end -rental_json = [] -50.times do - rental = { - "checkout_date": Faker::Date.backward(14), - "due_date": Faker::Date.forward(14), - "movie_id": rand(Movie.count) + 1, - "customer_id": rand(Customer.count) + 1 - } - - rental_json << rental -end - -File.open("db/seeds/rentals.json","w") do |f| - f.write(rental_json.to_json) -end - -JSON.parse(File.read('db/seeds/rentals.json')).each do |rental| - Rental.create!(rental) -end +# rental_json = [] +# 50.times do +# rental = { +# "checkout_date": Faker::Date.backward(14), +# "due_date": Faker::Date.forward(14), +# "movie_id": rand(Movie.count) + 1, +# "customer_id": rand(Customer.count) + 1 +# } +# +# rental_json << rental +# end +# +# File.open("db/seeds/rentals.json","w") do |f| +# f.write(rental_json.to_json) +# end +# +# JSON.parse(File.read('db/seeds/rentals.json')).each do |rental| +# Rental.create!(rental) +# end From 054699958bb9d9c6ad657425a82fe515cd563998 Mon Sep 17 00:00:00 2001 From: Aurea Date: Wed, 7 Nov 2018 10:13:33 -0800 Subject: [PATCH 24/25] add tests for available inventory method --- app/controllers/customers_controller.rb | 5 ---- config/routes.rb | 2 -- db/seeds.rb | 20 ---------------- db/seeds/rentals.json | 1 - test/models/movie_test.rb | 31 +++++++++++++++++++++++++ 5 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 db/seeds/rentals.json diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index be634b575..0d59108d2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -5,11 +5,6 @@ def index render json: jsonify(customers), status: :ok end - - # def zomg - # render json: { :zomg => "it works"} - # end - private #strong params def customer_params diff --git a/config/routes.rb b/config/routes.rb index 957f0763b..565062e8a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,6 +7,4 @@ post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out' post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in' - get '/customers/zomg', to: 'customers#zomg', as: 'zomg' - end diff --git a/db/seeds.rb b/db/seeds.rb index 9b4bbf1aa..0e87d3b07 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -7,23 +7,3 @@ JSON.parse(File.read('db/seeds/movies.json')).each do |movie| Movie.create!(movie) end - -# rental_json = [] -# 50.times do -# rental = { -# "checkout_date": Faker::Date.backward(14), -# "due_date": Faker::Date.forward(14), -# "movie_id": rand(Movie.count) + 1, -# "customer_id": rand(Customer.count) + 1 -# } -# -# rental_json << rental -# end -# -# File.open("db/seeds/rentals.json","w") do |f| -# f.write(rental_json.to_json) -# end -# -# JSON.parse(File.read('db/seeds/rentals.json')).each do |rental| -# Rental.create!(rental) -# end diff --git a/db/seeds/rentals.json b/db/seeds/rentals.json deleted file mode 100644 index 0937ca93e..000000000 --- a/db/seeds/rentals.json +++ /dev/null @@ -1 +0,0 @@ -[{"checkout_date":"2018-10-27","due_date":"2018-11-14","movie_id":79,"customer_id":70},{"checkout_date":"2018-10-23","due_date":"2018-11-10","movie_id":35,"customer_id":56},{"checkout_date":"2018-11-03","due_date":"2018-11-14","movie_id":88,"customer_id":68},{"checkout_date":"2018-11-02","due_date":"2018-11-13","movie_id":4,"customer_id":196},{"checkout_date":"2018-10-27","due_date":"2018-11-08","movie_id":66,"customer_id":9},{"checkout_date":"2018-10-31","due_date":"2018-11-07","movie_id":82,"customer_id":152},{"checkout_date":"2018-10-26","due_date":"2018-11-13","movie_id":46,"customer_id":193},{"checkout_date":"2018-10-28","due_date":"2018-11-06","movie_id":11,"customer_id":15},{"checkout_date":"2018-11-02","due_date":"2018-11-09","movie_id":10,"customer_id":194},{"checkout_date":"2018-10-28","due_date":"2018-11-13","movie_id":50,"customer_id":123},{"checkout_date":"2018-10-23","due_date":"2018-11-14","movie_id":68,"customer_id":28},{"checkout_date":"2018-10-29","due_date":"2018-11-07","movie_id":44,"customer_id":154},{"checkout_date":"2018-11-04","due_date":"2018-11-06","movie_id":57,"customer_id":161},{"checkout_date":"2018-11-01","due_date":"2018-11-18","movie_id":3,"customer_id":98},{"checkout_date":"2018-10-29","due_date":"2018-11-06","movie_id":69,"customer_id":199},{"checkout_date":"2018-10-30","due_date":"2018-11-14","movie_id":49,"customer_id":90},{"checkout_date":"2018-10-22","due_date":"2018-11-13","movie_id":67,"customer_id":183},{"checkout_date":"2018-10-28","due_date":"2018-11-19","movie_id":84,"customer_id":157},{"checkout_date":"2018-10-24","due_date":"2018-11-11","movie_id":43,"customer_id":1},{"checkout_date":"2018-10-22","due_date":"2018-11-19","movie_id":48,"customer_id":78},{"checkout_date":"2018-10-27","due_date":"2018-11-18","movie_id":6,"customer_id":179},{"checkout_date":"2018-10-29","due_date":"2018-11-11","movie_id":30,"customer_id":155},{"checkout_date":"2018-10-25","due_date":"2018-11-16","movie_id":12,"customer_id":85},{"checkout_date":"2018-10-24","due_date":"2018-11-12","movie_id":64,"customer_id":170},{"checkout_date":"2018-10-27","due_date":"2018-11-17","movie_id":41,"customer_id":81},{"checkout_date":"2018-11-04","due_date":"2018-11-09","movie_id":41,"customer_id":119},{"checkout_date":"2018-10-28","due_date":"2018-11-07","movie_id":82,"customer_id":26},{"checkout_date":"2018-10-28","due_date":"2018-11-07","movie_id":54,"customer_id":71},{"checkout_date":"2018-10-22","due_date":"2018-11-07","movie_id":11,"customer_id":147},{"checkout_date":"2018-11-04","due_date":"2018-11-11","movie_id":90,"customer_id":1},{"checkout_date":"2018-10-22","due_date":"2018-11-17","movie_id":17,"customer_id":146},{"checkout_date":"2018-10-22","due_date":"2018-11-10","movie_id":32,"customer_id":119},{"checkout_date":"2018-10-23","due_date":"2018-11-11","movie_id":60,"customer_id":60},{"checkout_date":"2018-10-29","due_date":"2018-11-11","movie_id":79,"customer_id":64},{"checkout_date":"2018-10-30","due_date":"2018-11-13","movie_id":70,"customer_id":95},{"checkout_date":"2018-10-25","due_date":"2018-11-13","movie_id":24,"customer_id":181},{"checkout_date":"2018-10-22","due_date":"2018-11-08","movie_id":72,"customer_id":93},{"checkout_date":"2018-10-22","due_date":"2018-11-09","movie_id":46,"customer_id":48},{"checkout_date":"2018-10-27","due_date":"2018-11-09","movie_id":43,"customer_id":28},{"checkout_date":"2018-10-23","due_date":"2018-11-16","movie_id":45,"customer_id":8},{"checkout_date":"2018-10-25","due_date":"2018-11-19","movie_id":65,"customer_id":76},{"checkout_date":"2018-10-22","due_date":"2018-11-08","movie_id":15,"customer_id":171},{"checkout_date":"2018-11-01","due_date":"2018-11-11","movie_id":26,"customer_id":53},{"checkout_date":"2018-10-22","due_date":"2018-11-07","movie_id":52,"customer_id":157},{"checkout_date":"2018-10-30","due_date":"2018-11-15","movie_id":72,"customer_id":72},{"checkout_date":"2018-10-22","due_date":"2018-11-16","movie_id":42,"customer_id":102},{"checkout_date":"2018-11-03","due_date":"2018-11-16","movie_id":54,"customer_id":144},{"checkout_date":"2018-11-01","due_date":"2018-11-19","movie_id":81,"customer_id":153},{"checkout_date":"2018-11-04","due_date":"2018-11-19","movie_id":66,"customer_id":67},{"checkout_date":"2018-10-25","due_date":"2018-11-14","movie_id":38,"customer_id":75}] diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ef3aca900..c7e418538 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -44,5 +44,36 @@ end + describe "available inventory" do + + it 'successfully returns available inventory of a movie' do + expect(movie.available_inventory).must_equal 9 + end + + it 'decreases when a customer has checked out a movie' do + + prev_inventory = movie.available_inventory + + + Rental.create!(movie_id: movie.id, customer_id: customers(:aurea).id) + + movie.reload + expect(movie.available_inventory).must_equal prev_inventory - 1 + end + + it 'increases when a customer has checked in a movie' do + + prev_inventory = movie.available_inventory + + rental = Rental.find_by(movie_id: movie.id, customer_id: customers(:layla).id) + + rental.update(return_date: Time.now ) + + movie.reload + + expect(movie.available_inventory).must_equal prev_inventory + 1 + end + end + end From f1025bbba05c964d290e5c8c285cacf7410e3db8 Mon Sep 17 00:00:00 2001 From: Aurea Date: Wed, 7 Nov 2018 10:23:50 -0800 Subject: [PATCH 25/25] fix controller tests --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 4 +-- test/controllers/movies_controller_test.rb | 12 ++++---- test/controllers/rentals_controller_test.rb | 16 +++++------ test/models/customer_test.rb | 28 +++++++++++++++++++ 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 0d59108d2..488c49518 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -8,7 +8,7 @@ def index private #strong params def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + params.permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) end def jsonify(customer_data) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 37b2de97e..53b8dc79b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require 'test_helper' describe CustomersController do - CUSTOMER_FIELDS = %w(name registered_at address city state postal_code phone).sort + CUSTOMER_FIELDS = %w(id name registered_at address city state postal_code phone movies_checked_out_count).sort def parse_body(expected_type:, expected_status: :success) must_respond_with expected_status @@ -21,7 +21,7 @@ def parse_body(expected_type:, expected_status: :success) body = parse_body(expected_type: Array) body.each do |customer| - + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 21b9d1de5..c7b1c792f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,7 @@ require 'test_helper' describe MoviesController do - MOVIE_FIELDS = %w(title overview release_date inventory).sort + MOVIE_FIELDS = %w(id title overview release_date inventory available_inventory).sort def parse_body(expected_type:, expected_status: :success) must_respond_with expected_status @@ -64,10 +64,8 @@ def parse_body(expected_type:, expected_status: :success) let (:movie_data) { { - movie: { - title: "test movie", - inventory: 10 - } + title: "test movie", + inventory: 10 } } @@ -82,14 +80,14 @@ def parse_body(expected_type:, expected_status: :success) movie = Movie.find(body["id"].to_i) - expect(movie.title).must_equal movie_data[:movie][:title] + expect(movie.title).must_equal movie_data[:title] end it 'does not successfully return if invalid' do - movie_data[:movie][:title] = nil + movie_data[:title] = nil expect { post movies_path, params: movie_data diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 23d721d81..ed158a3ea 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,10 +14,10 @@ def parse_body(expected_type:, expected_status: :success) let (:rental_data) { { - rental: { - movie_id: Movie.first.id, - customer_id: Customer.first.id - } + + movie_id: Movie.first.id, + customer_id: Customer.first.id + } } @@ -36,7 +36,7 @@ def parse_body(expected_type:, expected_status: :success) it "does not successfully create if invalid" do - movie = Movie.find_by(id: rental_data[:rental][:movie_id] ) + movie = Movie.find_by(id: rental_data[:movie_id] ) movie.destroy expect{ @@ -55,10 +55,8 @@ def parse_body(expected_type:, expected_status: :success) @rental = rentals(:one) @existing_rental = { - rental: { - movie_id: @rental.movie.id, - customer_id: @rental.customer.id - } + movie_id: @rental.movie.id, + customer_id: @rental.customer.id } end it "successfully updates rental with return date" do diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index ab40630ea..65fd21e2f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -30,4 +30,32 @@ end end + + describe "movies checked out count" do + it "returns number of movies checked out" do + expect(customer.movies_checked_out_count).must_equal 1 + end + + it "increases by one when customer checks out movie" do + + prev_checked = customer.movies_checked_out_count + + Rental.create!(customer_id: customer.id, movie_id: movies(:jaws).id) + + customer.reload + + expect(customer.movies_checked_out_count).must_equal prev_checked + 1 + end + + it "decreases by one when customer checks in a movie" do + prev_checked = customer.movies_checked_out_count + + rental = Rental.find_by(customer_id: customer.id, movie_id: movies(:titanic).id) + rental.update(return_date: Time.now) + + customer.reload + + expect(customer.movies_checked_out_count).must_equal prev_checked - 1 + end + end end