From cce497428298f4c6ce1ccb7e86d4d05ebd8d204d Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Mon, 5 Nov 2018 11:47:15 -0800 Subject: [PATCH 01/27] rails initial --- .gitignore | 23 ++ .ruby-version | 1 + Gemfile | 54 +++ Gemfile.lock | 169 ++++++++++ Guardfile | 9 + README.md | 313 +----------------- Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++ bin/spring | 17 + bin/update | 28 ++ config.ru | 5 + config/application.rb | 41 +++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 +++++ config/environment.rb | 5 + config/environments/development.rb | 54 +++ config/environments/production.rb | 85 +++++ config/environments/test.rb | 46 +++ .../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 | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 ++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 947 insertions(+), 300 deletions(-) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/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 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..a9f49bedc --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.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] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..6295b9809 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +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) + ansi (1.5.0) + arel (9.0.0) + 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) + 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) + 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) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + pg (1.1.3) + pry (0.12.0) + 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) + 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-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.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) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/README.md b/README.md index 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/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..f2199f07d --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +Bi5Fziomm18el2ojEVHz4qJEoNJRKoURalhJ25CwVdWGxNxsXAt2yhWUldXojvAC1zgyXpn9SCHjGaMq5L72WmcERNstK1vZUoEKHV7HEcpAWmIrBkP8yBfPZEGzasUcdrHFNXjkU6l+auTaI3gl5IRLaX+QA9fzgSy3sUptdJvrG3e/ViBiqeMGS99skZrhs6u+e7U2Fb5K3pNw5j+6JFS7FV4ltPZgJymFgb/UawAZv1RirP4HieLnH8uWIsBXcu0u1p6raPjFnLESGh7OdFDXF8raFD46mwhsYt9DaUTNktqN5MSKyUm2cPm1ZoRo32aIGZI9ZTHiJCComTFvVO99DyCi4KZwQNDOSCQVBYEcnZzODos4M63kkINiK91Y59/G5Uu1eTSdT8y9PyLPfXmO+AUwXyOAWaBs--FNE3An2Yg28/XH1a--UYuaYXAbQUisMlVfrQq4wQ== \ 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..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/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/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 2342eb3cedffbb9ab8078a9423c479b6b7a922b8 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Mon, 5 Nov 2018 12:20:27 -0800 Subject: [PATCH 02/27] controller setup --- app/controllers/customers_controller.rb | 36 +++++++++++++++++++ app/controllers/movies_controller.rb | 36 +++++++++++++++++++ app/models/controller.rb | 2 ++ app/models/movie.rb | 2 ++ .../20181105195923_create_controllers.rb | 8 +++++ db/migrate/20181105195929_create_movies.rb | 8 +++++ db/schema.rb | 18 ++++++++++ test/controllers/customers_controller_test.rb | 7 ++++ test/controllers/movies_controller_test.rb | 7 ++++ test/fixtures/controllers.yml | 11 ++++++ test/fixtures/movies.yml | 11 ++++++ test/models/controller_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ 13 files changed, 164 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/models/controller.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20181105195923_create_controllers.rb create mode 100644 db/migrate/20181105195929_create_movies.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/fixtures/controllers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/controller_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..c780bd20a --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,36 @@ +class CustomersController < ApplicationController + def index + customers = Customer.all + render json: jsonify(customer) + end + + def show + customer = Customer.find_by(id: params[:id]) + if customer + render json: jsonify(customer) + else + # head :not_found + render json: { errors: { customer_id: ["No such customer"] }}, status: :not_found + # render json: {}, status: :not_found + end + end + + def create + customer = Customer.new(customer_params) + if customer.save + render json: {id: customer.id} + else + render_error(:bad_request, customer.errors.messages) + end + end + + private + + def customer_params + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + end + + def jsonify(customer) + return customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..f7e5f430d --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,36 @@ +class MoviesController < ApplicationController + def index + movies = Movie.all + render json: jsonify(movie) + end + + def show + movie = Movie.find_by(id: params[:id]) + if movie + render json: jsonify(movie) + else + # head :not_found + render json: { errors: { movie_id: ["No such movie"] }}, status: :not_found + # render json: {}, status: :not_found + end + end + + def create + movie = Movie.new(movie_params) + if movie.save + render json: {id: movie.id} + else + render_error(:bad_request, movie.errors.messages) + end + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end + + def jsonify(movie) + return movie.as_json(only: [:id, :title, :overview, :release_date, :inventory) + end +end diff --git a/app/models/controller.rb b/app/models/controller.rb new file mode 100644 index 000000000..654345f96 --- /dev/null +++ b/app/models/controller.rb @@ -0,0 +1,2 @@ +class Controller < 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/db/migrate/20181105195923_create_controllers.rb b/db/migrate/20181105195923_create_controllers.rb new file mode 100644 index 000000000..388fb4e7c --- /dev/null +++ b/db/migrate/20181105195923_create_controllers.rb @@ -0,0 +1,8 @@ +class CreateControllers < ActiveRecord::Migration[5.2] + def change + create_table :controllers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181105195929_create_movies.rb b/db/migrate/20181105195929_create_movies.rb new file mode 100644 index 000000000..a82569703 --- /dev/null +++ b/db/migrate/20181105195929_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/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/controllers.yml b/test/fixtures/controllers.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/controllers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/controller_test.rb b/test/models/controller_test.rb new file mode 100644 index 000000000..70ce1bbda --- /dev/null +++ b/test/models/controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Controller do + let(:controller) { Controller.new } + + it "must be valid" do + value(controller).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From f1fd3fa2f89bfb45823e120946b70e6bac83a5f0 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Mon, 5 Nov 2018 14:26:58 -0800 Subject: [PATCH 03/27] setup database, models, controllers --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 36 +++++++++++++++++++ app/models/controller.rb | 2 -- app/models/customer.rb | 3 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 3 ++ config/routes.rb | 3 +- .../20181105195923_create_controllers.rb | 8 ----- db/migrate/20181105220433_create_customers.rb | 8 +++++ db/migrate/20181105221602_create_rentals.rb | 8 +++++ .../20181105221815_add_columns_to_customer.rb | 10 ++++++ .../20181105222135_add_columns_to_movies.rb | 8 +++++ .../20181105222228_add_columns_to_rental.rb | 6 ++++ .../20181105222333_add_movies_to_rentals.rb | 5 +++ .../20181105222418_add_customer_to_rental.rb | 5 +++ .../20181105222521_add_state_to_customer.rb | 5 +++ db/schema.rb | 36 ++++++++++++++++++- test/controllers/rentals_controller_test.rb | 7 ++++ .../{controllers.yml => customers.yml} | 0 test/fixtures/rentals.yml | 11 ++++++ test/models/controller_test.rb | 9 ----- test/models/customer_test.rb | 9 +++++ test/models/rental_test.rb | 9 +++++ 24 files changed, 174 insertions(+), 23 deletions(-) create mode 100644 app/controllers/rentals_controller.rb delete mode 100644 app/models/controller.rb create mode 100644 app/models/customer.rb create mode 100644 app/models/rental.rb delete mode 100644 db/migrate/20181105195923_create_controllers.rb create mode 100644 db/migrate/20181105220433_create_customers.rb create mode 100644 db/migrate/20181105221602_create_rentals.rb create mode 100644 db/migrate/20181105221815_add_columns_to_customer.rb create mode 100644 db/migrate/20181105222135_add_columns_to_movies.rb create mode 100644 db/migrate/20181105222228_add_columns_to_rental.rb create mode 100644 db/migrate/20181105222333_add_movies_to_rentals.rb create mode 100644 db/migrate/20181105222418_add_customer_to_rental.rb create mode 100644 db/migrate/20181105222521_add_state_to_customer.rb create mode 100644 test/controllers/rentals_controller_test.rb rename test/fixtures/{controllers.yml => customers.yml} (100%) create mode 100644 test/fixtures/rentals.yml delete mode 100644 test/models/controller_test.rb create mode 100644 test/models/customer_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c780bd20a..cac8ab7b1 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -31,6 +31,6 @@ def customer_params end def jsonify(customer) - return customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone) + return customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f7e5f430d..5a005584e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -31,6 +31,6 @@ def movie_params end def jsonify(movie) - return movie.as_json(only: [:id, :title, :overview, :release_date, :inventory) + return movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..1d9daa5a2 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,36 @@ +class RentalsController < ApplicationController + def index + rentals = Rental.all + render json: jsonify(rental) + end + + def show + rental = Rental.find_by(id: params[:id]) + if rental + render json: jsonify(rental) + else + # head :not_found + render json: { errors: { rental_id: ["No such rental"] }}, status: :not_found + # render json: {}, status: :not_found + end + end + + def create + rental = Rental.new(rental_params) + if rental.save + render json: {id: rental.id} + else + render_error(:bad_request, rental.errors.messages) + end + end + + private + + def rental_params + params.require(:rental).permit(:check_in_date, :check_out_date) + end + + def jsonify(rental) + return rental.as_json(only: [(:check_in_date, :check_out_date)]) + end +end diff --git a/app/models/controller.rb b/app/models/controller.rb deleted file mode 100644 index 654345f96..000000000 --- a/app/models/controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Controller < ApplicationRecord -end diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..1870a7613 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,3 @@ +class Customer < ApplicationRecord + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true +end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..2fbd7bcec 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,4 @@ class Movie < ApplicationRecord + validates :title, :overview, :release_date, :inventory, presence: true + validates :inventory, numericality: {only_integer: true} end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..f17040c0c --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,3 @@ +class Rental < ApplicationRecord + validates :check_in_date, :check_out_date, presence: true +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..b9f566a25 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :customers, only: [:index, :show, :create] + resources :movies, only: [:index, :show, :create] end diff --git a/db/migrate/20181105195923_create_controllers.rb b/db/migrate/20181105195923_create_controllers.rb deleted file mode 100644 index 388fb4e7c..000000000 --- a/db/migrate/20181105195923_create_controllers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateControllers < ActiveRecord::Migration[5.2] - def change - create_table :controllers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20181105220433_create_customers.rb b/db/migrate/20181105220433_create_customers.rb new file mode 100644 index 000000000..21dbca0f6 --- /dev/null +++ b/db/migrate/20181105220433_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/20181105221602_create_rentals.rb b/db/migrate/20181105221602_create_rentals.rb new file mode 100644 index 000000000..328e5f49a --- /dev/null +++ b/db/migrate/20181105221602_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/20181105221815_add_columns_to_customer.rb b/db/migrate/20181105221815_add_columns_to_customer.rb new file mode 100644 index 000000000..55ce0766f --- /dev/null +++ b/db/migrate/20181105221815_add_columns_to_customer.rb @@ -0,0 +1,10 @@ +class AddColumnsToCustomer < ActiveRecord::Migration[5.2] + def change + add_column :customers, :name, :string + add_column :customers, :registered_at, :datetime + add_column :customers, :address, :string + add_column :customers, :city, :string + add_column :customers, :postal_code, :string + add_column :customers, :phone, :string + end +end diff --git a/db/migrate/20181105222135_add_columns_to_movies.rb b/db/migrate/20181105222135_add_columns_to_movies.rb new file mode 100644 index 000000000..aff8623c7 --- /dev/null +++ b/db/migrate/20181105222135_add_columns_to_movies.rb @@ -0,0 +1,8 @@ +class AddColumnsToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :title, :string + add_column :movies, :overview, :string + add_column :movies, :release_date, :date + add_column :movies, :inventory, :integer + end +end diff --git a/db/migrate/20181105222228_add_columns_to_rental.rb b/db/migrate/20181105222228_add_columns_to_rental.rb new file mode 100644 index 000000000..8da1fa672 --- /dev/null +++ b/db/migrate/20181105222228_add_columns_to_rental.rb @@ -0,0 +1,6 @@ +class AddColumnsToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :check_in_date, :datetime + add_column :rentals, :check_out_date, :datetime + end +end diff --git a/db/migrate/20181105222333_add_movies_to_rentals.rb b/db/migrate/20181105222333_add_movies_to_rentals.rb new file mode 100644 index 000000000..cbc96ccbe --- /dev/null +++ b/db/migrate/20181105222333_add_movies_to_rentals.rb @@ -0,0 +1,5 @@ +class AddMoviesToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/migrate/20181105222418_add_customer_to_rental.rb b/db/migrate/20181105222418_add_customer_to_rental.rb new file mode 100644 index 000000000..14686c900 --- /dev/null +++ b/db/migrate/20181105222418_add_customer_to_rental.rb @@ -0,0 +1,5 @@ +class AddCustomerToRental < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/migrate/20181105222521_add_state_to_customer.rb b/db/migrate/20181105222521_add_state_to_customer.rb new file mode 100644 index 000000000..bf91d6736 --- /dev/null +++ b/db/migrate/20181105222521_add_state_to_customer.rb @@ -0,0 +1,5 @@ +class AddStateToCustomer < ActiveRecord::Migration[5.2] + def change + add_column :customers, :state, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..66b8daf44 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,43 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 2018_11_05_222521) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "customers", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "postal_code" + t.string "phone" + t.string "state" + end + + create_table "movies", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + end + + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.datetime "check_in_date" + t.datetime "check_out_date" + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/controllers.yml b/test/fixtures/customers.yml similarity index 100% rename from test/fixtures/controllers.yml rename to test/fixtures/customers.yml diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/controller_test.rb b/test/models/controller_test.rb deleted file mode 100644 index 70ce1bbda..000000000 --- a/test/models/controller_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require "test_helper" - -describe Controller do - let(:controller) { Controller.new } - - it "must be valid" do - value(controller).must_be :valid? - end -end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 6d2f478f84d0720d669d796189e7002f8d5736a6 Mon Sep 17 00:00:00 2001 From: Melissa O'Hearn Date: Mon, 5 Nov 2018 15:07:09 -0800 Subject: [PATCH 04/27] add relations --- app/controllers/customers_controller.rb | 1 + app/models/customer.rb | 5 +++++ app/models/movie.rb | 2 ++ app/models/rental.rb | 3 +++ config/routes.rb | 6 ++++++ 5 files changed, 17 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index cac8ab7b1..b8b1d07f8 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all render json: jsonify(customer) + end def show diff --git a/app/models/customer.rb b/app/models/customer.rb index 1870a7613..7bfc750e5 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,8 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 2fbd7bcec..f399e5e5f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals + validates :title, :overview, :release_date, :inventory, presence: true validates :inventory, numericality: {only_integer: true} end diff --git a/app/models/rental.rb b/app/models/rental.rb index f17040c0c..a84ab308e 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,3 +1,6 @@ class Rental < ApplicationRecord + belongs_to_many :movies, :customers + + validates :check_in_date, :check_out_date, presence: true end diff --git a/config/routes.rb b/config/routes.rb index b9f566a25..3fe70dd0e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,10 @@ Rails.application.routes.draw do resources :customers, only: [:index, :show, :create] resources :movies, only: [:index, :show, :create] + + + + + + end From 8a61f0f85dc61136797c8d53409213f2cae0699b Mon Sep 17 00:00:00 2001 From: Melissa O'Hearn Date: Mon, 5 Nov 2018 15:32:48 -0800 Subject: [PATCH 05/27] fixed controller bugs --- app/controllers/application_controller.rb | 5 +++++ app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 2 +- config/routes.rb | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..fa8b93a55 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 b8b1d07f8..4a2c948d3 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: jsonify(customer) + render json: jsonify(customers) end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5a005584e..27fac355f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: jsonify(movie) + render json: jsonify(movies) end def show diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1d9daa5a2..ee15d4813 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,7 @@ class RentalsController < ApplicationController def index rentals = Rental.all - render json: jsonify(rental) + render json: jsonify(rentals) end def show diff --git a/config/routes.rb b/config/routes.rb index 3fe70dd0e..5486b23d0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,10 @@ Rails.application.routes.draw do + resources :customers, only: [:index, :show, :create] resources :movies, only: [:index, :show, :create] - + From 057022128c90d9da4a13bf6f3b0ccc62a22730a0 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Mon, 5 Nov 2018 15:36:47 -0800 Subject: [PATCH 06/27] typo --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index cac8ab7b1..6c1ff24c4 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: jsonify(customer) + render json: jsonify(customers) end def show diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5a005584e..27fac355f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: jsonify(movie) + render json: jsonify(movies) end def show diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1d9daa5a2..ee15d4813 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,7 @@ class RentalsController < ApplicationController def index rentals = Rental.all - render json: jsonify(rental) + render json: jsonify(rentals) end def show From 029a393bdd9715627838c1de0a0962b4483662b0 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Mon, 5 Nov 2018 15:41:35 -0800 Subject: [PATCH 07/27] merge --- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 7bfc750e5..c34154023 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,7 +1,7 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals - + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true diff --git a/app/models/movie.rb b/app/models/movie.rb index f399e5e5f..c55795065 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord has_many :rentals - + validates :title, :overview, :release_date, :inventory, presence: true validates :inventory, numericality: {only_integer: true} end From c2f05787d843c9fcccbd484cff329965bd41c621 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Mon, 5 Nov 2018 15:48:26 -0800 Subject: [PATCH 08/27] minor typos, tests working --- app/controllers/rentals_controller.rb | 2 +- app/models/rental.rb | 3 ++- test/test_helper.rb | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ee15d4813..4eb77fb52 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -31,6 +31,6 @@ def rental_params end def jsonify(rental) - return rental.as_json(only: [(:check_in_date, :check_out_date)]) + return rental.as_json(only: [:check_in_date, :check_out_date]) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index a84ab308e..60e2b7bda 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,5 +1,6 @@ class Rental < ApplicationRecord - belongs_to_many :movies, :customers + has_and_belongs_to_many :movies + belongs_to :customers validates :check_in_date, :check_out_date, presence: true diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From d4359e9fa039fe81c73b864ebc2ab4a728eafe1a Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Mon, 5 Nov 2018 16:49:25 -0800 Subject: [PATCH 09/27] movie model testing, all pass --- test/fixtures/movies.yml | 16 +++++++++++----- test/models/movie_test.rb | 32 +++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index dc3ee79b5..c0d7a3e4b 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 +one: + title: Elf + overview: A movie about an elf + release_date: 2001-01-18 + inventory: 3 + +two: + title: Finding nemo + overview: Nemo gets lost and chaos ensues + release_date: 2004-01-10 + inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..d123be1f7 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,39 @@ require "test_helper" +require 'pry' describe Movie do + let(:elf) { movies(:one) } let(:movie) { Movie.new } it "must be valid" do - value(movie).must_be :valid? + value(elf).must_be :valid? end + + it "requires title, overview, release_date, and inventory" do + required_fields = [:title, :overview, :release_date, :inventory] + + required_fields.each do |field| + elf[field] = nil + expect(elf.valid?).must_equal false + elf.reload + end + end + + it "requires a numeric inventory" do + elf.inventory = "string" + expect(elf.valid?).must_equal false + end + + # describe "relations" do + # it 'has many rentals' do + # expect(elf.rentals).must_be_kind_of Rental + # end + # end end + + +# describe 'relations' do +# it 'has an order' do +# cart_entry = cart_entries(:entry) +# cart_entry.order.must_equal orders(:persons_order) +# end From 07d5c1cfa0145eea3edcc4dd182b8478a420cc4b Mon Sep 17 00:00:00 2001 From: Melissa O'Hearn Date: Mon, 5 Nov 2018 16:50:03 -0800 Subject: [PATCH 10/27] tests for customer models --- test/fixtures/customers.yml | 29 ++++++++++++++++++++++++++--- test/models/customer_test.rb | 30 ++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dc3ee79b5..78d5f54ed 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,8 +4,31 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} +one: + name: Disco Ball + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 12 Main St + city: Seattle + state: WA + postal_code: 12345 + phone: 222-333-4444 + # column: value # -two: {} -# column: value +two: + name: Fritz Chip + registered_at: Thu, 30 Apr 2015 08:54:14 -0700 + address: 111 Hot Road + city: Kent + state: WA + postal_code: 23456 + phone: 333-444-5555 + +three: + name: Petunia Picklepants + registered_at: Fri, 01 May 2015 09:54:14 -0700 + address: 2324 Happy Hills Ct + city: Casper + state: WY + postal_code: 45678 + phone: 555-666-7777 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..013fb9190 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,35 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:petunia_picklepants) { customers(:three) } + it "must be valid" do - value(customer).must_be :valid? + value(petunia_picklepants).must_be :valid? + end + + it "requires name, registered_at, address, city, state, postal code, phone" do + required_fields = [:name, :registered_at, :address, :city, :state, :postal_code, :phone] + + required_fields.each do |field| + petunia_picklepants[field] = nil + + expect(petunia_picklepants.valid?).must_equal false + + petunia_picklepants.reload + end end + + + describe 'relations' do + it 'has many rentals' do + expect(petunia_picklepants).must_respond_to :rentals + end + + it 'has many movies' do + expect(petunia_picklepants).must_respond_to :movies + end + + end + end From 80a6b58b7cc2958ac4c9d686c4274e775090544e Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Tue, 6 Nov 2018 12:13:25 -0800 Subject: [PATCH 11/27] fix relations in models --- app/models/movie.rb | 1 + app/models/rental.rb | 2 +- test/controllers/customers_controller_test.rb | 55 ++++++++++++++++--- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index c55795065..b60aa1804 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,6 @@ class Movie < ApplicationRecord has_many :rentals + has_many :customers, through: :rentals validates :title, :overview, :release_date, :inventory, presence: true validates :inventory, numericality: {only_integer: true} diff --git a/app/models/rental.rb b/app/models/rental.rb index 60e2b7bda..7c210357f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,5 +1,5 @@ class Rental < ApplicationRecord - has_and_belongs_to_many :movies + belongs_to :movies belongs_to :customers diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..1c0449fa8 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,48 @@ -require "test_helper" - -describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end -end +# require "test_helper" +# +# describe CustomersController do +# def check_response( expected_type:, expected_) +# +# end +# describe "index" do +# it "is a valid route" do +# +# end +# end +# end +# +# def index +# customers = Customer.all +# render json: jsonify(customers) +# +# end +# +# def show +# customer = Customer.find_by(id: params[:id]) +# if customer +# render json: jsonify(customer) +# else +# # head :not_found +# render json: { errors: { customer_id: ["No such customer"] }}, status: :not_found +# # render json: {}, status: :not_found +# end +# end +# +# def create +# customer = Customer.new(customer_params) +# if customer.save +# render json: {id: customer.id} +# else +# render_error(:bad_request, customer.errors.messages) +# end +# end +# +# private +# +# def customer_params +# params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) +# end +# +# def jsonify(customer) +# return customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) +# end From 8e03e6c76431c861e067e51837818b572b244946 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Tue, 6 Nov 2018 14:11:56 -0800 Subject: [PATCH 12/27] movie controller tests, all passing --- test/controllers/customers_controller_test.rb | 55 ++------------ test/controllers/movies_controller_test.rb | 75 ++++++++++++++++++- 2 files changed, 79 insertions(+), 51 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 1c0449fa8..5e123f6cd 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,48 +1,7 @@ -# require "test_helper" -# -# describe CustomersController do -# def check_response( expected_type:, expected_) -# -# end -# describe "index" do -# it "is a valid route" do -# -# end -# end -# end -# -# def index -# customers = Customer.all -# render json: jsonify(customers) -# -# end -# -# def show -# customer = Customer.find_by(id: params[:id]) -# if customer -# render json: jsonify(customer) -# else -# # head :not_found -# render json: { errors: { customer_id: ["No such customer"] }}, status: :not_found -# # render json: {}, status: :not_found -# end -# end -# -# def create -# customer = Customer.new(customer_params) -# if customer.save -# render json: {id: customer.id} -# else -# render_error(:bad_request, customer.errors.messages) -# end -# end -# -# private -# -# def customer_params -# params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) -# end -# -# def jsonify(customer) -# return customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) -# end +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..8ab3d7a9f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,76 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + MOVIE_FIELDS = %w(id title overview release_date inventory).sort + + def check_response(expected_type:, expected_status: :success) + 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 "is a real working route" do + get movies_path + body = check_response(expected_type: Array) + expect(body.length).must_equal Movie.count + + 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 = check_response(expected_type: Array) + expect(body).must_equal [] + + end + end + + describe 'show' do + + it "retrieves info on one movie" do + #arrange + movie = Movie.first + #act + get movie_path(movie) + #assert + body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal MOVIE_FIELDS + end + it "does something when the movie DNE" do + #arrange + movie = Movie.first + movie.destroy + + #act + get movie_path(movie) + + #assert + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body).must_include "errors" + end + end + + describe "create method" do + it "can create a movie" do + movie_params = { + movie: { + title: "Movie", + overview: 2018-01-01, + release_date: "words words words", + inventory: 3 + }} + post movies_path(params: movie_params) + body = check_response(expected_type: Hash) + end + end + end From 13f602dc0f49c90d244c2dfd26d447c4f3a3080e Mon Sep 17 00:00:00 2001 From: Melissa O'Hearn Date: Tue, 6 Nov 2018 14:25:20 -0800 Subject: [PATCH 13/27] customer controller tests passing --- config/routes.rb | 4 - test/controllers/customers_controller_test.rb | 116 +++++++++++++++++- 2 files changed, 113 insertions(+), 7 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 5486b23d0..19da9f137 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,8 +4,4 @@ resources :movies, only: [:index, :show, :create] - - - - end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..b41d40a40 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,117 @@ require "test_helper" +require "pry" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + CUSTOMER_FIELDS = %w(id name registered_at address city state postal_code phone).sort + + # Helper method to dry code + def check_response(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 "retrieves all the customers" do + get customers_path + + body = check_response(expected_type: Array) + + expect(body.length).must_equal Customer.count + + body.each do |customer| + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it "returns an empty array when there are no customers" do + # Arrange + Customer.destroy_all + + # Act + get customers_path + + # Assert + body = check_response(expected_type: Array) + expect(body).must_equal [] + end + + end + + describe "show" do + it "retrieves info on one customer" do + # Arrange + customer = Customer.first + + # Act + get customer_path(customer) + + # Assert + body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal CUSTOMER_FIELDS + end + + it "sends back not_found when the pet DNE" do + # Arrange + customer = Customer.first + customer.destroy + + # Act + get customer_path(customer) + + # Assert + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body).must_include "errors" + end + + describe "create" do + let(:customer_hash) { + + { + name: 'Disco Tech', + registered_at: 'Wed, 29 Apr 2015 07:54:14 -0700', + address: '11 Main St', + city: 'Seattle', + state: 'WA', + postal_code: '12345', + phone: '222-222-4444' + } + } + + it "can create a customer" do + + expect { + post customers_path, params: { customer: customer_hash } + }.must_change 'Customer.count', 1 + + body = check_response(expected_type: Hash) + customer = Customer.find(body["id"].to_i) + + expect(customer.name).must_equal customer_hash[:name] + + end + + it "returns an error for invalid customer data" do + + customer_hash["name"] = nil + + expect { + post customers_path, params: { customer: customer_hash } + }.wont_change "Customer.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "name" + must_respond_with :bad_request + + end + + end + + end end From c9cf93845092a663dd23152996b737b7e6fdc6b3 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Tue, 6 Nov 2018 15:02:39 -0800 Subject: [PATCH 14/27] fix movie controller test --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 36 ++++++++++++++++------ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 27fac355f..57397aa3d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -27,7 +27,7 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end def jsonify(movie) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 8ab3d7a9f..027d9ef25 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -60,17 +60,35 @@ def check_response(expected_type:, expected_status: :success) end describe "create method" do - it "can create a movie" do - movie_params = { - movie: { - title: "Movie", - overview: 2018-01-01, - release_date: "words words words", + let(:movie_data) { + { + title: "Idk", + overview: "string", + release_date: "2018-9-9", inventory: 3 - }} - post movies_path(params: movie_params) + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: movie_data + }.must_change "Movie.count" + body = check_response(expected_type: Hash) + movie = Movie.find(body["id"].to_i) + expect(movie.title).must_equal movie_data[:title] end - end + it "returns an error for invalid movie data" do + movie_data["title"] = nil + # binding.pry + expect { + post movies_path, params: movie_data + }.wont_change "Movie.count" + body = check_response(expected_type: Hash) + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end end From 29ad210a0ff22f39b345c4e7992d7e8c74c8ff24 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Tue, 6 Nov 2018 15:52:47 -0800 Subject: [PATCH 15/27] require :movie on params --- app/controllers/customers_controller.rb | 1 + app/controllers/movies_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 4a2c948d3..c966bbe5d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -18,6 +18,7 @@ def show def create customer = Customer.new(customer_params) + binding.pry if customer.save render json: {id: customer.id} else diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 57397aa3d..27fac355f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -27,7 +27,7 @@ def create private def movie_params - params.permit(:title, :overview, :release_date, :inventory) + params.require(:movie).permit(:title, :overview, :release_date, :inventory) end def jsonify(movie) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b41d40a40..75b974c10 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -97,7 +97,7 @@ def check_response(expected_type:, expected_status: :success) it "returns an error for invalid customer data" do customer_hash["name"] = nil - + expect { post customers_path, params: { customer: customer_hash } }.wont_change "Customer.count" diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 027d9ef25..94ef2a2c2 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -71,7 +71,7 @@ def check_response(expected_type:, expected_status: :success) it "creates a new movie given valid data" do expect { - post movies_path, params: movie_data + post movies_path, params: {movie: movie_data} }.must_change "Movie.count" body = check_response(expected_type: Hash) @@ -83,7 +83,7 @@ def check_response(expected_type:, expected_status: :success) movie_data["title"] = nil # binding.pry expect { - post movies_path, params: movie_data + post movies_path, params: {movie: movie_data} }.wont_change "Movie.count" body = check_response(expected_type: Hash) expect(body).must_include "errors" From 0a2b18a7a23d15b0caedd0b8a2d309acb216eee1 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Tue, 6 Nov 2018 16:14:49 -0800 Subject: [PATCH 16/27] add due date to rentals --- db/migrate/20181107001339_add_due_date_to_rentals.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181107001339_add_due_date_to_rentals.rb diff --git a/db/migrate/20181107001339_add_due_date_to_rentals.rb b/db/migrate/20181107001339_add_due_date_to_rentals.rb new file mode 100644 index 000000000..61af77fc2 --- /dev/null +++ b/db/migrate/20181107001339_add_due_date_to_rentals.rb @@ -0,0 +1,5 @@ +class AddDueDateToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :due_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 66b8daf44..b7062e104 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_222521) do +ActiveRecord::Schema.define(version: 2018_11_07_001339) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,7 @@ t.datetime "check_out_date" t.bigint "movie_id" t.bigint "customer_id" + t.date "due_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 0638e94af65d74cb5df2dca9b73e229d78b4d883 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Tue, 6 Nov 2018 16:44:52 -0800 Subject: [PATCH 17/27] add migration --- app/controllers/customers_controller.rb | 1 - .../20181107004334_add_available_inventory_to_movies.rb | 5 +++++ .../20181107004351_add_movies_checked_out_to_customers.rb | 5 +++++ db/schema.rb | 4 +++- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20181107004334_add_available_inventory_to_movies.rb create mode 100644 db/migrate/20181107004351_add_movies_checked_out_to_customers.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c966bbe5d..4a2c948d3 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -18,7 +18,6 @@ def show def create customer = Customer.new(customer_params) - binding.pry if customer.save render json: {id: customer.id} else diff --git a/db/migrate/20181107004334_add_available_inventory_to_movies.rb b/db/migrate/20181107004334_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..9bcb714a6 --- /dev/null +++ b/db/migrate/20181107004334_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/migrate/20181107004351_add_movies_checked_out_to_customers.rb b/db/migrate/20181107004351_add_movies_checked_out_to_customers.rb new file mode 100644 index 000000000..792542b88 --- /dev/null +++ b/db/migrate/20181107004351_add_movies_checked_out_to_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index b7062e104..687a04fdc 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_07_001339) do +ActiveRecord::Schema.define(version: 2018_11_07_004351) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "postal_code" t.string "phone" t.string "state" + t.integer "movies_checked_out" end create_table "movies", force: :cascade do |t| @@ -34,6 +35,7 @@ t.string "overview" t.date "release_date" t.integer "inventory" + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| From ee480315e8efb338713bdee62af3e627220ce760 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Wed, 7 Nov 2018 09:59:24 -0800 Subject: [PATCH 18/27] schema changes, updated yml --- app/controllers/customers_controller.rb | 4 ++-- app/controllers/movies_controller.rb | 4 ++-- app/controllers/rentals_controller.rb | 4 ++-- app/models/customer.rb | 2 +- app/models/movie.rb | 4 +++- app/models/rental.rb | 2 +- .../20181107173706_remove_due_date_from_rentals.rb | 5 +++++ .../20181107173801_add_due_date_to_rentals_again.rb | 5 +++++ db/schema.rb | 4 ++-- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- test/fixtures/customers.yml | 4 ++++ test/fixtures/movies.yml | 2 ++ test/fixtures/rentals.yml | 11 ++++++----- 14 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 db/migrate/20181107173706_remove_due_date_from_rentals.rb create mode 100644 db/migrate/20181107173801_add_due_date_to_rentals_again.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 4a2c948d3..1607d84bd 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -28,10 +28,10 @@ def create private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out) end def jsonify(customer) - return customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]) + return customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out]) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 27fac355f..dcf71f02d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -27,10 +27,10 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) end def jsonify(movie) - return movie.as_json(only: [:id, :title, :overview, :release_date, :inventory]) + return movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory]) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4eb77fb52..2b81dddad 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -27,10 +27,10 @@ def create private def rental_params - params.require(:rental).permit(:check_in_date, :check_out_date) + params.require(:rental).permit(:check_in_date, :check_out_date, :due_date) end def jsonify(rental) - return rental.as_json(only: [:check_in_date, :check_out_date]) + return rental.as_json(only: [:check_in_date, :check_out_date, :due_date]) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index c34154023..810e0f25d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,7 +2,7 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals - validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index b60aa1804..814a99260 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,6 +2,8 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals - validates :title, :overview, :release_date, :inventory, presence: true + validates :title, :overview, :release_date, :inventory, :available_inventory, presence: true validates :inventory, numericality: {only_integer: true} + validates :available_inventory, numericality: {only_integer: true} + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 7c210357f..e9a1154f6 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,5 +3,5 @@ class Rental < ApplicationRecord belongs_to :customers - validates :check_in_date, :check_out_date, presence: true + validates :due_date, :check_out_date, presence: true end diff --git a/db/migrate/20181107173706_remove_due_date_from_rentals.rb b/db/migrate/20181107173706_remove_due_date_from_rentals.rb new file mode 100644 index 000000000..bf82af059 --- /dev/null +++ b/db/migrate/20181107173706_remove_due_date_from_rentals.rb @@ -0,0 +1,5 @@ +class RemoveDueDateFromRentals < ActiveRecord::Migration[5.2] + def change + remove_column :rentals, :due_date + end +end diff --git a/db/migrate/20181107173801_add_due_date_to_rentals_again.rb b/db/migrate/20181107173801_add_due_date_to_rentals_again.rb new file mode 100644 index 000000000..42ecd01d1 --- /dev/null +++ b/db/migrate/20181107173801_add_due_date_to_rentals_again.rb @@ -0,0 +1,5 @@ +class AddDueDateToRentalsAgain < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :due_date, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index 687a04fdc..e4e758551 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_07_004351) do +ActiveRecord::Schema.define(version: 2018_11_07_173801) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,7 +45,7 @@ t.datetime "check_out_date" t.bigint "movie_id" t.bigint "customer_id" - t.date "due_date" + t.datetime "due_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 75b974c10..416bbc8fb 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,7 +2,7 @@ require "pry" describe CustomersController do - CUSTOMER_FIELDS = %w(id 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).sort # Helper method to dry code def check_response(expected_type:, expected_status: :success) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 94ef2a2c2..790cd02b1 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(id title overview release_date inventory).sort + MOVIE_FIELDS = %w(id title overview release_date inventory available_inventory).sort def check_response(expected_type:, expected_status: :success) expect(response.header['Content-Type']).must_include 'json' diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 78d5f54ed..cd44729bc 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -12,6 +12,7 @@ one: state: WA postal_code: 12345 phone: 222-333-4444 + movies_checked_out: # column: value # @@ -23,6 +24,8 @@ two: state: WA postal_code: 23456 phone: 333-444-5555 + movies_checked_out: + three: name: Petunia Picklepants @@ -32,3 +35,4 @@ three: state: WY postal_code: 45678 phone: 555-666-7777 + movies_checked_out: diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index c0d7a3e4b..340d4d34a 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -9,9 +9,11 @@ one: overview: A movie about an elf release_date: 2001-01-18 inventory: 3 + available_inventory: 3 two: title: Finding nemo overview: Nemo gets lost and chaos ensues release_date: 2004-01-10 inventory: 1 + available_inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..da513b972 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,9 @@ # 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: + check_out_date: Wed, 29 Apr 2015 07:54:14 -0700 + check_in_date: Wed, 6 May 2015 07:54:14 -0700 + due_date: Wed, 6 May 2015 07:54:14 -0700 + movie: one + customer: one From ace40b5f68351b3ca20afc11d00d28ee7283a56a Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Wed, 7 Nov 2018 10:12:31 -0800 Subject: [PATCH 19/27] refactor movies test --- app/models/customer.rb | 2 +- test/controllers/movies_controller_test.rb | 3 ++- test/fixtures/rentals.yml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 810e0f25d..c34154023 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,7 +2,7 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals - validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out, presence: true + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 790cd02b1..a80e527a4 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -65,7 +65,8 @@ def check_response(expected_type:, expected_status: :success) title: "Idk", overview: "string", release_date: "2018-9-9", - inventory: 3 + inventory: 3, + available_inventory: 3 } } diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index da513b972..c9a4a8a73 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -8,5 +8,5 @@ one: check_out_date: Wed, 29 Apr 2015 07:54:14 -0700 check_in_date: Wed, 6 May 2015 07:54:14 -0700 due_date: Wed, 6 May 2015 07:54:14 -0700 - movie: one - customer: one + movie_id: one + customer_id: one From 3493bcc142de76ced1b3a89ff2121db89b428e65 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Wed, 7 Nov 2018 11:52:43 -0800 Subject: [PATCH 20/27] add rental controller tests --- app/controllers/rentals_controller.rb | 6 +- app/models/rental.rb | 4 +- config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 114 +++++++++++++++++++- test/models/movie_test.rb | 3 +- 5 files changed, 119 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2b81dddad..f6969bd70 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -17,8 +17,10 @@ def show def create rental = Rental.new(rental_params) + # binding.pry if rental.save render json: {id: rental.id} + # binding.pry else render_error(:bad_request, rental.errors.messages) end @@ -27,10 +29,10 @@ def create private def rental_params - params.require(:rental).permit(:check_in_date, :check_out_date, :due_date) + params.require(:rental).permit(:check_in_date, :check_out_date, :due_date, :movie_id, :customer_id) end def jsonify(rental) - return rental.as_json(only: [:check_in_date, :check_out_date, :due_date]) + return rental.as_json(only: [:check_in_date, :check_out_date, :due_date, :movie_id, :customer_id]) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index e9a1154f6..97c0b6521 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,6 @@ class Rental < ApplicationRecord - belongs_to :movies - belongs_to :customers + belongs_to :movie + belongs_to :customer validates :due_date, :check_out_date, presence: true diff --git a/config/routes.rb b/config/routes.rb index 19da9f137..3a52bcf9c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,6 @@ resources :customers, only: [:index, :show, :create] resources :movies, only: [:index, :show, :create] - + resources :rentals, only: [:index, :show, :create] end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..e16458dc6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,115 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + RENTAL_FIELDS = %w(check_in_date check_out_date due_date movie_id customer_id).sort + + def check_response(expected_type:, expected_status: :success) + 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 "is a real working route" do + get rentals_path + body = check_response(expected_type: Array) + expect(body.length).must_equal Rental.count + + body.each do |rental| + expect(rental.keys.sort).must_equal RENTAL_FIELDS + end + end + + it "returns an empty array when there are no rentals" do + + Rental.destroy_all + + get rentals_path + body = check_response(expected_type: Array) + expect(body).must_equal [] + + end + end + + describe 'show' do + + it "retrieves info on one rental" do + #arrange + rental = Rental.first + #act + get rental_path(rental) + #assert + body = check_response(expected_type: Hash) + expect(body.keys.sort).must_equal RENTAL_FIELDS + end + it "does something when the rental DNE" do + #arrange + rental = Rental.first + rental.destroy + + #act + get rental_path(rental) + + #assert + body = check_response(expected_type: Hash, expected_status: :not_found) + expect(body).must_include "errors" + end + end + + describe "create method" do + let(:rental_data) { + { + check_out_date: "Wed, 29 Apr 2015 07:54:14 -0700", + check_in_date: "Wed, 6 May 2015 07:54:14 -0700", + due_date: "Wed, 6 May 2015 07:54:14 -0700", + customer_id: customers(:one).id, + movie_id: movies(:one).id + } + } + + it "creates a new rental given valid data" do + expect { + post rentals_path, params: {rental: rental_data} + }.must_change "Rental.count" + + body = check_response(expected_type: Hash) + rental = Rental.find(body["id"].to_i) + expect(rental.movie_id).must_equal rental_data[:movie_id] + end + + it "returns an error for invalid rental data" do + rental_data["check_out_date"] = nil + # binding.pry + expect { + post rentals_path, params: {rental: rental_data} + }.wont_change "Rental.count" + body = check_response(expected_type: Hash) + expect(body).must_include "errors" + expect(body["errors"]).must_include "check_out_date" + must_respond_with :bad_request + end + # it "decrements one movie from available inventory" do + # expect { + # post rentals_path, params: {rental: rental_data} + # }.must_change "Rental.count" + # body = check_response(expected_type: Hash) + # rental = Rental.find(body["id"].to_i) + # movie = rental.movie_id + # movie = Movie.find(movie) + # expect(Movie.available_inventory).must_change "available_inventory.count", -1 + # end + it "decrements one movie from available inventory" do + expect do + post rentals_path, params: {rental: rental_data} + body = check_response(expected_type: Hash) + rental = Rental.find(body["id"].to_i) + movie = rental.movie_id + movie = Movie.find(movie) + end.to_change(movie.available_inventory, :count).by(-1) + end + + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index d123be1f7..7f26e9dab 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,8 @@ require "test_helper" -require 'pry' describe Movie do let(:elf) { movies(:one) } - let(:movie) { Movie.new } + # let(:movie) { Movie.new } it "must be valid" do value(elf).must_be :valid? From bb75dc26269c0aee0eb36162dec395ba9aaea2d5 Mon Sep 17 00:00:00 2001 From: Melissa O'Hearn Date: Wed, 7 Nov 2018 11:53:07 -0800 Subject: [PATCH 21/27] started rental model test --- app/models/rental.rb | 7 ++++- test/models/rental_test.rb | 57 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index e9a1154f6..7b6b81f65 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,5 +3,10 @@ class Rental < ApplicationRecord belongs_to :customers - validates :due_date, :check_out_date, presence: true + validates :movie_id, :customer_id, :due_date, :check_out_date, presence: true + + # Generates an ID? -- Controller + # Calcluate due date based on check_out_date + # Generate Overdue status based on due date and check_in_date + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..63adf3fa7 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,62 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + # let(:rental_data) { rentals(:one) } + # let(:elf) { movies(:two) } + # let(:petunia_picklepants) { customers(:three) } +# +# { +# { +# check_out_date: "Wed, 29 Apr 2015 07:54:14 -0700", +# check_in_date: "Wed, 6 May 2015 07:54:14 -0700", +# due_date:" Wed, 6 May 2015 07:54:14 -0700", +# movie_id: movies(:one).id, +# customer_id: customers(:one).id +# } +# } it "must be valid" do - value(rental).must_be :valid? + customer = Customer.first + movie = Movie.first + rental = Rental.new(customer_id = customer.id, movie_id = movie.id, check_in_date = "Wed, 6 May 2015 07:54:14 -0700", check_out_date = "Wed, 29 Apr 2015 07:54:14 -0700", due_date = " Wed, 6 May 2015 07:54:14 -0700") + + rental.must_be :valid? + end + + it "requires movie id, customer id, due date, check out date"do + required_fields = [:movie_id, :customer_id, :due_date, :check_out_date] + + required_fields.each do |field| + one[field] = nil + + expect(one.valid?).must_equal false + + one.reload + end + + end + + it "calculates due date" do + end + + it "checkout date must be after check_in_date" do end + + it "assigins overdue status based on due_date and check_in_date" do + end + + describe "relations" do + + it 'belongs to a movie' do + + expect() + end + + it 'belongs to a customer' do + end + end + + + + end From 32009a1d72d18a3eed00d39ed73a0c9809ab146a Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Wed, 7 Nov 2018 13:44:15 -0800 Subject: [PATCH 22/27] refactor rental controller tests --- test/controllers/rentals_controller_test.rb | 60 ++++++++++++++------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e16458dc6..f5b31759d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -91,25 +91,45 @@ def check_response(expected_type:, expected_status: :success) expect(body["errors"]).must_include "check_out_date" must_respond_with :bad_request end - # it "decrements one movie from available inventory" do - # expect { - # post rentals_path, params: {rental: rental_data} - # }.must_change "Rental.count" - # body = check_response(expected_type: Hash) - # rental = Rental.find(body["id"].to_i) - # movie = rental.movie_id - # movie = Movie.find(movie) - # expect(Movie.available_inventory).must_change "available_inventory.count", -1 - # end - it "decrements one movie from available inventory" do - expect do - post rentals_path, params: {rental: rental_data} - body = check_response(expected_type: Hash) - rental = Rental.find(body["id"].to_i) - movie = rental.movie_id - movie = Movie.find(movie) - end.to_change(movie.available_inventory, :count).by(-1) - end - + # # it "decrements one movie from available inventory" do + # # expect { + # # post rentals_path, params: {rental: rental_data} + # # }.must_change "Rental.count" + # # body = check_response(expected_type: Hash) + # # rental = Rental.find(body["id"].to_i) + # # movie = rental.movie_id + # # movie = Movie.find(movie) + # # expect(Movie.available_inventory).must_change "available_inventory.count", -1 + # # end end + +# describe "movie" do +# before do +# @rental_data = +# { +# check_out_date: "Wed, 29 Apr 2015 07:54:14 -0700", +# check_in_date: "Wed, 6 May 2015 07:54:14 -0700", +# due_date: "Wed, 6 May 2015 07:54:14 -0700", +# customer_id: customers(:one).id, +# movie_id: movies(:one).id +# } +# +# post rentals_path, params: {@rental_data} +# body = check_response(expected_type: Hash) +# rental = Rental.find(body["id"].to_i) +# movie = rental.movie_id +# @movie = Movie.find(movie) +# end +# +# it "decrements one movie from available inventory" do +# expect(@movie.available_inventory).must_change "Movie.available_inventory.count", -1 +# end +# # expect do +# # post rentals_path, params: {rental: rental_data} +# # body = check_response(expected_type: Hash) +# # rental = Rental.find(body["id"].to_i) +# # movie = rental.movie_id +# # @movie = Movie.find(movie) +# # end.to_change(@movie.available_inventory, :count).by(-1) +# end end From 3f10946957c348fcc7e7f5929b127d8ce2810310 Mon Sep 17 00:00:00 2001 From: Melissa O'Hearn Date: Wed, 7 Nov 2018 13:54:31 -0800 Subject: [PATCH 23/27] passing tests rentals model --- test/models/rental_test.rb | 57 +++++++++++++++----------------------- 1 file changed, 23 insertions(+), 34 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 63adf3fa7..aa406f37e 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,58 +1,47 @@ require "test_helper" describe Rental do - # let(:rental_data) { rentals(:one) } - # let(:elf) { movies(:two) } - # let(:petunia_picklepants) { customers(:three) } -# -# { -# { -# check_out_date: "Wed, 29 Apr 2015 07:54:14 -0700", -# check_in_date: "Wed, 6 May 2015 07:54:14 -0700", -# due_date:" Wed, 6 May 2015 07:54:14 -0700", -# movie_id: movies(:one).id, -# customer_id: customers(:one).id -# } -# } + + let(:rental_data) { + { + check_out_date: "Wed, 29 Apr 2015 07:54:14 -0700", + check_in_date: "Wed, 6 May 2015 07:54:14 -0700", + due_date:" Wed, 6 May 2015 07:54:14 -0700", + movie_id: movies(:one).id, + customer_id: customers(:one).id + } + } + before do + @rental = Rental.new(rental_data) + @rental.save + end it "must be valid" do - customer = Customer.first - movie = Movie.first - rental = Rental.new(customer_id = customer.id, movie_id = movie.id, check_in_date = "Wed, 6 May 2015 07:54:14 -0700", check_out_date = "Wed, 29 Apr 2015 07:54:14 -0700", due_date = " Wed, 6 May 2015 07:54:14 -0700") + # rental = Rental.new(rental_data) - rental.must_be :valid? + @rental.must_be :valid? end - it "requires movie id, customer id, due date, check out date"do - required_fields = [:movie_id, :customer_id, :due_date, :check_out_date] + it "requires movie id, customer id, due date, check out date" do + required_fields = [:movie_id, :customer_id, :due_date, :check_out_date] required_fields.each do |field| - one[field] = nil + @rental[field] = nil - expect(one.valid?).must_equal false + expect(@rental.valid?).must_equal false - one.reload + @rental.reload end - - end - - it "calculates due date" do - end - - it "checkout date must be after check_in_date" do - end - - it "assigins overdue status based on due_date and check_in_date" do end describe "relations" do - it 'belongs to a movie' do - expect() + expect(@rental).must_respond_to :movie end it 'belongs to a customer' do + expect(@rental).must_respond_to :customer end end From 623e3979dd73611a125a9c895ce462ee938952b1 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Wed, 7 Nov 2018 15:50:14 -0800 Subject: [PATCH 24/27] add check out method --- app/controllers/movies_controller.rb | 3 +- app/controllers/rentals_controller.rb | 36 +++++++++++++++++---- config/routes.rb | 3 +- db/seeds.rb | 6 ++-- test/controllers/rentals_controller_test.rb | 6 ++-- 5 files changed, 41 insertions(+), 13 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index dcf71f02d..33747cb26 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -17,6 +17,7 @@ def show def create movie = Movie.new(movie_params) + movie.available_inventory = movie_params[:inventory] if movie.save render json: {id: movie.id} else @@ -27,7 +28,7 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) + params.require(:movie).permit(:title, :overview, :release_date, :inventory) end def jsonify(movie) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f6969bd70..bf7004272 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -17,22 +17,46 @@ def show def create rental = Rental.new(rental_params) - # binding.pry - if rental.save - render json: {id: rental.id} + if rental.movie.available_inventory == 0 # binding.pry + render json: { errors: { rental_id: ["No available inventory"] }}, status: :bad_request else - render_error(:bad_request, rental.errors.messages) + rental.check_out_date = DateTime.now + rental.due_date = DateTime.now + 1.week + if rental.save + rental.movie.available_inventory = rental.movie.available_inventory - 1 + # binding.pry + render json: jsonify(rental) + else + render_error(:bad_request, rental.errors.messages) + end end end + # def check_in + # rental = Rental.find_by(id: params[:id]) + # rental.check_in_date = DateTime.now + # + # end + + # def self.check_out + # rental = Rental.new(rental_params) + # rental.check_out_date = DateTime.now + # rental.due_date = DateTime.now + 1.week + # if rental.save + # render json: jsonify(rental) + # else + # render_error(:bad_request, rental.errors.messages) + # end + # end + # private def rental_params - params.require(:rental).permit(:check_in_date, :check_out_date, :due_date, :movie_id, :customer_id) + params.require(:rental).permit(:movie_id, :customer_id) end def jsonify(rental) - return rental.as_json(only: [:check_in_date, :check_out_date, :due_date, :movie_id, :customer_id]) + return rental.as_json(only: [:id, :check_in_date, :check_out_date, :due_date, :movie_id, :customer_id]) end end diff --git a/config/routes.rb b/config/routes.rb index 3a52bcf9c..45b042361 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,6 @@ resources :customers, only: [:index, :show, :create] resources :movies, only: [:index, :show, :create] resources :rentals, only: [:index, :show, :create] - + post '/rentals/check-out', to: 'rentals#create' end +# get 'recipes', to: 'recipes#index', as: 'recipes' diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..2fd9ee463 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -2,6 +2,8 @@ Customer.create!(customer) end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) +JSON.parse(File.read('db/seeds/movies.json')).each do |raw_movie| + movie = Movie.new(raw_movie) + movie.available_inventory = movie.inventory + movie.save! end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f5b31759d..348970d8c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe RentalsController do - RENTAL_FIELDS = %w(check_in_date check_out_date due_date movie_id customer_id).sort + RENTAL_FIELDS = %w(id check_in_date check_out_date due_date movie_id customer_id).sort def check_response(expected_type:, expected_status: :success) expect(response.header['Content-Type']).must_include 'json' @@ -81,14 +81,14 @@ def check_response(expected_type:, expected_status: :success) end it "returns an error for invalid rental data" do - rental_data["check_out_date"] = nil + rental_data["movie_id"] = nil # binding.pry expect { post rentals_path, params: {rental: rental_data} }.wont_change "Rental.count" body = check_response(expected_type: Hash) expect(body).must_include "errors" - expect(body["errors"]).must_include "check_out_date" + expect(body["errors"]).must_include "movie_id" must_respond_with :bad_request end # # it "decrements one movie from available inventory" do From 1462886c9808061c393dee9c8954361c2744959b Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Thu, 8 Nov 2018 09:22:26 -0800 Subject: [PATCH 25/27] add check in method --- app/controllers/rentals_controller.rb | 17 +++++++++++------ config/routes.rb | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index bf7004272..e9a5ef7b2 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -26,18 +26,23 @@ def create if rental.save rental.movie.available_inventory = rental.movie.available_inventory - 1 # binding.pry - render json: jsonify(rental) + render json: jsonify(rental.movie.available_inventory) else render_error(:bad_request, rental.errors.messages) end end end - # def check_in - # rental = Rental.find_by(id: params[:id]) - # rental.check_in_date = DateTime.now - # - # end + def check_in + rental = Rental.find_by(rental_params) + if rental + rental.check_in_date = DateTime.now + rental.movie.available_inventory = rental.movie.available_inventory + 1 + render json: jsonify(rental.movie.available_inventory) + else + render json: { errors: { rental_id: ["No such rental"] }}, status: :bad_request + end + end # def self.check_out # rental = Rental.new(rental_params) diff --git a/config/routes.rb b/config/routes.rb index 45b042361..51e9f9cd7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,5 +4,6 @@ resources :movies, only: [:index, :show, :create] resources :rentals, only: [:index, :show, :create] post '/rentals/check-out', to: 'rentals#create' + post '/rentals/check-in', to: 'rentals#check_in' end # get 'recipes', to: 'recipes#index', as: 'recipes' From dc2295196fbabe61aa6faa0165b45e951dc84681 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Fri, 9 Nov 2018 15:07:48 -0800 Subject: [PATCH 26/27] add customer to rental check/in/out methods, change column --- app/controllers/customers_controller.rb | 4 ++-- app/controllers/rentals_controller.rb | 18 ++++++++++++------ app/models/rental.rb | 17 +++++++++++++++++ ...4351_add_movies_checked_out_to_customers.rb | 2 +- ...09230159_remove_movies_checked_out_count.rb | 5 +++++ ...dd_movies_checked_out_count_to_customers.rb | 5 +++++ db/schema.rb | 4 ++-- db/seeds.rb | 8 ++++++-- ..._Wave_2_smoke_tests.postman_collection.json | 6 +++--- ..._Wave_3_smoke_tests.postman_collection.json | 10 +++++----- test/controllers/customers_controller_test.rb | 2 +- test/fixtures/customers.yml | 6 +++--- 12 files changed, 62 insertions(+), 25 deletions(-) create mode 100644 db/migrate/20181109230159_remove_movies_checked_out_count.rb create mode 100644 db/migrate/20181109230231_add_movies_checked_out_count_to_customers.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1607d84bd..3f4a75515 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -28,10 +28,10 @@ def create private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out) + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count) end def jsonify(customer) - return customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out]) + return customer.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e9a5ef7b2..5c7d44a67 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -17,6 +17,9 @@ def show def create rental = Rental.new(rental_params) + movie = Movie.find_by(id: rental_params[:movie_id]) + # binding.pry + customer = Customer.find_by(id: rental_params[:customer_id]) if rental.movie.available_inventory == 0 # binding.pry render json: { errors: { rental_id: ["No available inventory"] }}, status: :bad_request @@ -24,8 +27,7 @@ def create rental.check_out_date = DateTime.now rental.due_date = DateTime.now + 1.week if rental.save - rental.movie.available_inventory = rental.movie.available_inventory - 1 - # binding.pry + rental.check_out_movie(customer, movie) render json: jsonify(rental.movie.available_inventory) else render_error(:bad_request, rental.errors.messages) @@ -35,12 +37,16 @@ def create def check_in rental = Rental.find_by(rental_params) + movie = Movie.find_by(id: rental_params[:movie_id]) + customer = Customer.find_by(id: rental_params[:customer_id]) if rental rental.check_in_date = DateTime.now - rental.movie.available_inventory = rental.movie.available_inventory + 1 - render json: jsonify(rental.movie.available_inventory) - else - render json: { errors: { rental_id: ["No such rental"] }}, status: :bad_request + rental.check_in_movie(customer, movie) + if rental.save + render json: jsonify(rental.movie.available_inventory) + else + render json: { errors: { rental_id: ["No such rental"] }}, status: :bad_request + end end end diff --git a/app/models/rental.rb b/app/models/rental.rb index bad4f3972..51887a382 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -9,4 +9,21 @@ class Rental < ApplicationRecord # Calcluate due date based on check_out_date # Generate Overdue status based on due date and check_in_date + def check_out_movie(customer, movie) + + available = movie.available_inventory + movie.update(available_inventory: available - 1) + + checked_out = customer.movies_checked_out_count + customer.update(movies_checked_out_count: checked_out + 1) + end + + def check_in_movie(customer, movie) + + available = movie.available_inventory + movie.update(available_inventory: available + 1) + + checked_out = customer.movies_checked_out_count + customer.update(movies_checked_out_count: checked_out - 1) + end end diff --git a/db/migrate/20181107004351_add_movies_checked_out_to_customers.rb b/db/migrate/20181107004351_add_movies_checked_out_to_customers.rb index 792542b88..fe2adb7a5 100644 --- a/db/migrate/20181107004351_add_movies_checked_out_to_customers.rb +++ b/db/migrate/20181107004351_add_movies_checked_out_to_customers.rb @@ -1,5 +1,5 @@ class AddMoviesCheckedOutToCustomers < ActiveRecord::Migration[5.2] def change - add_column :customers, :movies_checked_out, :integer + add_column :customers, :movies_checked_out_count, :integer end end diff --git a/db/migrate/20181109230159_remove_movies_checked_out_count.rb b/db/migrate/20181109230159_remove_movies_checked_out_count.rb new file mode 100644 index 000000000..6e8bbd687 --- /dev/null +++ b/db/migrate/20181109230159_remove_movies_checked_out_count.rb @@ -0,0 +1,5 @@ +class RemoveMoviesCheckedOutCount < ActiveRecord::Migration[5.2] + def change + remove_column :customers, :movies_checked_out + end +end diff --git a/db/migrate/20181109230231_add_movies_checked_out_count_to_customers.rb b/db/migrate/20181109230231_add_movies_checked_out_count_to_customers.rb new file mode 100644 index 000000000..daf499e36 --- /dev/null +++ b/db/migrate/20181109230231_add_movies_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountToCustomers < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index e4e758551..df9566350 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_07_173801) do +ActiveRecord::Schema.define(version: 2018_11_09_230231) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,7 +25,7 @@ t.string "postal_code" t.string "phone" t.string "state" - t.integer "movies_checked_out" + t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| diff --git a/db/seeds.rb b/db/seeds.rb index 2fd9ee463..ef1901521 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,9 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - Customer.create!(customer) +JSON.parse(File.read('db/seeds/customers.json')).each do |raw_customer| + # Customer.create!(customer) + customer = Customer.new(raw_customer) + customer.movies_checked_out_count = 0 + customer.save! + end JSON.parse(File.read('db/seeds/movies.json')).each do |raw_movie| diff --git a/test/VideoStoreAPI_Wave_2_smoke_tests.postman_collection.json b/test/VideoStoreAPI_Wave_2_smoke_tests.postman_collection.json index 2173fda2c..589aeb65b 100644 --- a/test/VideoStoreAPI_Wave_2_smoke_tests.postman_collection.json +++ b/test/VideoStoreAPI_Wave_2_smoke_tests.postman_collection.json @@ -27,7 +27,7 @@ "", "// Save info on the first customer", "postman.setEnvironmentVariable(\"customer_id\", jsonData[0].id);", - "postman.setEnvironmentVariable(\"customer_mcoc\", jsonData[0].movies_checked_out_count);", + "postman.setEnvironmentVariable(\"customer_mcoc\", jsonData[0].movies_checked_out_count_count);", "", "// Check required fields", "var hasId = true;", @@ -43,7 +43,7 @@ " hasRegisteredAt = hasRegisteredAt && \"registered_at\" in customer;", " hasPostalCode = hasPostalCode && \"postal_code\" in customer;", " hasPhone = hasPhone && \"phone\" in customer;", - " hasMoviesCheckedOutCount = hasMoviesCheckedOutCount && \"movies_checked_out_count\" in customer;", + " hasMoviesCheckedOutCount = hasMoviesCheckedOutCount && \"movies_checked_out_count_count\" in customer;", "});", "", "tests[\"All customers have id\"] = hasId;", @@ -51,7 +51,7 @@ "tests[\"All customers have registered_at\"] = hasRegisteredAt;", "tests[\"All customers have postal_code\"] = hasPostalCode;", "tests[\"All customers have phone\"] = hasPhone;", - "tests[\"All customers have movies_checked_out_count\"] = hasMoviesCheckedOutCount;" + "tests[\"All customers have movies_checked_out_count_count\"] = hasMoviesCheckedOutCount;" ] } } diff --git a/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json b/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json index 9f640d98c..79407986b 100644 --- a/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json +++ b/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json @@ -27,7 +27,7 @@ "", "// Save info on the first customer", "postman.setEnvironmentVariable(\"customer_id\", jsonData[0].id);", - "postman.setEnvironmentVariable(\"customer_mcoc\", jsonData[0].movies_checked_out_count);", + "postman.setEnvironmentVariable(\"customer_mcoc\", jsonData[0].movies_checked_out_count_count);", "", "// Check required fields", "var hasId = true;", @@ -43,7 +43,7 @@ " hasRegisteredAt = hasRegisteredAt && \"registered_at\" in customer;", " hasPostalCode = hasPostalCode && \"postal_code\" in customer;", " hasPhone = hasPhone && \"phone\" in customer;", - " hasMoviesCheckedOutCount = hasMoviesCheckedOutCount && \"movies_checked_out_count\" in customer;", + " hasMoviesCheckedOutCount = hasMoviesCheckedOutCount && \"movies_checked_out_count_count\" in customer;", "});", "", "tests[\"All customers have id\"] = hasId;", @@ -51,7 +51,7 @@ "tests[\"All customers have registered_at\"] = hasRegisteredAt;", "tests[\"All customers have postal_code\"] = hasPostalCode;", "tests[\"All customers have phone\"] = hasPhone;", - "tests[\"All customers have movies_checked_out_count\"] = hasMoviesCheckedOutCount;" + "tests[\"All customers have movies_checked_out_count_count\"] = hasMoviesCheckedOutCount;" ] } } @@ -259,7 +259,7 @@ "", "// Check that the mcoc has increased", "var expected = Number(postman.getEnvironmentVariable(\"customer_mcoc\")) + 1;", - "tests[\"Customer's movie check out count increased\"] = customerList[0].movies_checked_out_count === expected;", + "tests[\"Customer's movie check out count increased\"] = customerList[0].movies_checked_out_count_count === expected;", "" ] } @@ -408,7 +408,7 @@ "", "// Check that the mcoc has decreased", "var expected = Number(postman.getEnvironmentVariable(\"customer_mcoc\"));", - "tests[\"Customer's movie check out count decreased\"] = customerList[0].movies_checked_out_count === expected;", + "tests[\"Customer's movie check out count decreased\"] = customerList[0].movies_checked_out_count_count === expected;", "" ] } diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 416bbc8fb..45eb99299 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,7 +2,7 @@ require "pry" describe CustomersController do - CUSTOMER_FIELDS = %w(id name registered_at address city state postal_code phone movies_checked_out).sort + CUSTOMER_FIELDS = %w(id name registered_at address city state postal_code phone movies_checked_out_count).sort # Helper method to dry code def check_response(expected_type:, expected_status: :success) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index cd44729bc..ba80db49a 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -12,7 +12,7 @@ one: state: WA postal_code: 12345 phone: 222-333-4444 - movies_checked_out: + movies_checked_out_count: # column: value # @@ -24,7 +24,7 @@ two: state: WA postal_code: 23456 phone: 333-444-5555 - movies_checked_out: + movies_checked_out_count: three: @@ -35,4 +35,4 @@ three: state: WY postal_code: 45678 phone: 555-666-7777 - movies_checked_out: + movies_checked_out_count: From 47025b7aff06f865c930b058bc4bb892d88845f3 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Fri, 9 Nov 2018 16:53:17 -0800 Subject: [PATCH 27/27] add tests for check in and check out model methods --- app/controllers/rentals_controller.rb | 6 +- test/controllers/rentals_controller_test.rb | 66 +++++++++++++++++---- test/fixtures/customers.yml | 6 +- test/models/rental_test.rb | 49 +++++++++++++++ 4 files changed, 111 insertions(+), 16 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5c7d44a67..62928fcec 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -20,7 +20,7 @@ def create movie = Movie.find_by(id: rental_params[:movie_id]) # binding.pry customer = Customer.find_by(id: rental_params[:customer_id]) - if rental.movie.available_inventory == 0 + if rental.valid? && rental.movie.available_inventory == 0 # binding.pry render json: { errors: { rental_id: ["No available inventory"] }}, status: :bad_request else @@ -28,7 +28,7 @@ def create rental.due_date = DateTime.now + 1.week if rental.save rental.check_out_movie(customer, movie) - render json: jsonify(rental.movie.available_inventory) + render json: jsonify(rental) else render_error(:bad_request, rental.errors.messages) end @@ -43,7 +43,7 @@ def check_in rental.check_in_date = DateTime.now rental.check_in_movie(customer, movie) if rental.save - render json: jsonify(rental.movie.available_inventory) + render json: jsonify(rental) else render json: { errors: { rental_id: ["No such rental"] }}, status: :bad_request end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 348970d8c..31ba26b29 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -91,18 +91,64 @@ def check_response(expected_type:, expected_status: :success) expect(body["errors"]).must_include "movie_id" must_respond_with :bad_request end - # # it "decrements one movie from available inventory" do - # # expect { - # # post rentals_path, params: {rental: rental_data} - # # }.must_change "Rental.count" - # # body = check_response(expected_type: Hash) - # # rental = Rental.find(body["id"].to_i) - # # movie = rental.movie_id - # # movie = Movie.find(movie) - # # expect(Movie.available_inventory).must_change "available_inventory.count", -1 - # # end + it "decrements available_inventory by one" do + rental = Rental.new(check_out_date: "Wed, 29 Apr 2015 07:54:14 -0700", check_in_date: "Wed, 6 May 2015 07:54:14 -0700", due_date: "Wed, 6 May 2015 07:54:14 -0700", customer_id: customers(:one).id, movie_id: movies(:one).id) + binding.pry + + # expect { + # post rentals_path, params: {rental: rental_data} + # }.must_change "Rental.count" + # binding.pry + # body = check_response(expected_type: Hash) + # + # movie = Movie.find(body["id"].to_i) + # + # expect { + # post rentals_path, params: {rental: rental_data} + # }.must_change "Movie.available_inventory.count" + + end + # it "changes the check_out date to now" do + # let(:rental_data_2) { + # { + # customer_id: customers(:one).id, + # movie_id: movies(:one).id + # } + # } + # + # expect { + # post rentals_path, params: {rental: rental_data} + # }.must_change "Rental.count" + # + # + # end + it "changes the due date to one week from now" do + + end + end + + describe 'check_in method' do + it "changes the check_in_date to now" do + + end + it "returns the rental" do + + end + it "returns an error if the rental cannot be found" do + + end end + # # it "decrements one movie from available inventory" do + # # expect { + # # post rentals_path, params: {rental: rental_data} + # # }.must_change "Rental.count" + # # body = check_response(expected_type: Hash) + # # rental = Rental.find(body["id"].to_i) + # # movie = rental.movie_id + # # movie = Movie.find(movie) + # # expect(Movie.available_inventory).must_change "available_inventory.count", -1 + # # end # describe "movie" do # before do # @rental_data = diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index ba80db49a..7a2c783a3 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -12,7 +12,7 @@ one: state: WA postal_code: 12345 phone: 222-333-4444 - movies_checked_out_count: + movies_checked_out_count: 0 # column: value # @@ -24,7 +24,7 @@ two: state: WA postal_code: 23456 phone: 333-444-5555 - movies_checked_out_count: + movies_checked_out_count: 0 three: @@ -35,4 +35,4 @@ three: state: WY postal_code: 45678 phone: 555-666-7777 - movies_checked_out_count: + movies_checked_out_count: 3 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index aa406f37e..4c66f13f3 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -34,6 +34,55 @@ end end + describe 'check out method' do + it "decrements from movie available inventory" do + customer = @rental.customer + movie = @rental.movie + + available = movie.available_inventory + + @rental.check_out_movie(customer, movie) + # binding.pry + movie.available_inventory.must_equal (available - 1) + end + it "adds to customer movie checked out count" do + customer = @rental.customer + movie = @rental.movie + + checked_out = customer.movies_checked_out_count + + @rental.check_out_movie(customer, movie) + # binding.pry + customer.movies_checked_out_count.must_equal (checked_out + 1) + end + + end + + describe 'check in method' do + it "decrements from movie available inventory" do + customer = @rental.customer + movie = @rental.movie + + available = movie.available_inventory + + @rental.check_in_movie(customer, movie) + # binding.pry + movie.available_inventory.must_equal (available + 1) + end + it "adds to customer movie checked out count" do + customer = @rental.customer + movie = @rental.movie + + checked_out = customer.movies_checked_out_count + + @rental.check_in_movie(customer, movie) + # binding.pry + customer.movies_checked_out_count.must_equal (checked_out - 1) + end + + end + + describe "relations" do it 'belongs to a movie' do