From 41006c50a18d59e42edea8083966b679f6d8b551 Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 5 Nov 2018 12:50:10 -0800 Subject: [PATCH 01/40] added models, relationships between models and seeded database --- .gitignore | 23 ++ .ruby-version | 1 + Gemfile | 54 +++ Gemfile.lock | 169 ++++++++++ Guardfile | 9 + README.md | 313 +----------------- Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 4 + app/models/movie.rb | 4 + app/models/rental.rb | 4 + 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 ++ db/migrate/20181105203755_create_customers.rb | 15 + db/migrate/20181105203856_create_movies.rb | 12 + db/migrate/20181105204126_create_rentals.rb | 10 + .../20181105204158_foreign_keys_to_rentals.rb | 6 + db/schema.rb | 52 +++ db/seeds.rb | 11 +- lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/customers.yml | 19 ++ test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 13 + test/fixtures/rentals.yml | 9 + test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 9 + test/models/movie_test.rb | 9 + test/models/rental_test.rb | 9 + test/test_helper.rb | 25 ++ tmp/.keep | 0 vendor/.keep | 0 73 files changed, 1132 insertions(+), 302 deletions(-) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/migrate/20181105203755_create_customers.rb create mode 100644 db/migrate/20181105203856_create_movies.rb create mode 100644 db/migrate/20181105204126_create_rentals.rb create mode 100644 db/migrate/20181105204158_foreign_keys_to_rentals.rb create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..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/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..b62bcbf04 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,4 @@ +class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..b2e4effc8 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,4 @@ +class Movie < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..f68df02af --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie +end diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..5fa62922a --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +e9hHFe8Ys00kX7hHA6QPgbE0F1F4HjdTdhJVQuoEdz/mlz/DRJzMaYqBPGvCLL82xZTGxcv3egd/wLzMXX6C/zqziojHabBl43Wr35CfkDl5Ia2qjPePmLCtWv5cx79FO6hQlGEl3rHs+bOnqaehECGeN5GPXLzkhKWm4AnoaATWRIuKT336LauDrCI0zaH5SwEc7PhodiDUrUpxVgiXbl0FWyVNgqEI3rr/V3ZOR26ajLB+WM0PqPLmza11bFbskws2gPla5kK55KisE0t8L/mXEe1qb+bTj5zqMswWReEPQlm1xjYlVCU+HU4OO4XAsWRiwf1Coe84UHPCTdvaxxHLF0aPy8/vmfdBez+MmzmgnzTMqIBsHKdiPr4iINlp2CnJv/3ZmtVjluggBAz0dy/QiTW5WoZiBIGQ--ciqh90OjG+FnlWdM--SSl7oXCqkxrAPFwQNtTGiw== \ 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/db/migrate/20181105203755_create_customers.rb b/db/migrate/20181105203755_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20181105203755_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/migrate/20181105203856_create_movies.rb b/db/migrate/20181105203856_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20181105203856_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20181105204126_create_rentals.rb b/db/migrate/20181105204126_create_rentals.rb new file mode 100644 index 000000000..c98328095 --- /dev/null +++ b/db/migrate/20181105204126_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :checkout_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/migrate/20181105204158_foreign_keys_to_rentals.rb b/db/migrate/20181105204158_foreign_keys_to_rentals.rb new file mode 100644 index 000000000..cb426e5d2 --- /dev/null +++ b/db/migrate/20181105204158_foreign_keys_to_rentals.rb @@ -0,0 +1,6 @@ +class ForeignKeysToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..aca155690 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,52 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_11_05_204158) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" +end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..a46e05ceb 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,14 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - Customer.create!(customer) + Customer.create!(customer) end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + Movie.create!(movie) end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..a221c16cb --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2018-11-05 12:37:55 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-11-05 12:37:55 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..f05dd0894 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2018-11-05 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-11-05 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..d71d80707 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: 2018-11-05 + due_date: 2018-11-05 + +two: + checkout_date: 2018-11-05 + due_date: 2018-11-05 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/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 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..59e480ec8 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +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 7fd1ae22bf5f2fad4d6d5b7a5a9b931d82189289 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Mon, 5 Nov 2018 12:50:35 -0800 Subject: [PATCH 02/40] New rails project --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + 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 | 25 +++ tmp/.keep | 0 vendor/.keep | 0 57 files changed, 935 insertions(+) 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..731ec7c93 --- /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.6 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/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..4d7513005 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +df49kV9d20xkieaZPx3CH2mBRgGh5xQp+uFmNJS8d3WDOh043WKJb++gxbFVnwuWdB8VViP17mBQS2YxQ/Y9rnGPWYms+4pd9O0hMlqWBiIDm0J84DJW2tOsA3U5CXFBbT+8izCWRZ/Bz/mhAiQYAU0Ml2Ow0nhfHfulSOLxTNDwXO/OMlpwthA9GqxEB8oNvHW3zala8oXanzCNofYB9VmT9n2SUXWB8Mk3pYv69fPfmh8bUARnbKJlAbDCwjsMKjlmsywtmr4SPflA5N6ZS8cRLRdPF3/MDnur7Miu3iQ9mWimF79d2usmi3mhJOzJgrl9aMeYAK3/sBfID41KwjhWb18bBuQvReUEe4pgOJEzMixqEZD0rVqzuuRpmr6VHgBJ8rnnPBOxHUQ6aCbLXLzEP/U5GLSTf+s0--PXuge26ye3qiuVw7--flNi1GmLaKWB9xbua/fh0w== \ 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..59e480ec8 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +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 359dee65468c6204d73badbce16d1d92b62a0b1f Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Mon, 5 Nov 2018 13:21:11 -0800 Subject: [PATCH 03/40] Wrote relationship and validation tests for rental, movie, and customer --- app/controllers/customers_controller.rb | 2 + app/controllers/movies_controller.rb | 2 + config/routes.rb | 6 +- db/seeds.rb | 7 -- test/controllers/customers_controller_test.rb | 7 ++ test/controllers/movies_controller_test.rb | 7 ++ test/fixtures/customers.yml | 4 +- test/fixtures/movies.yml | 4 +- test/fixtures/rentals.yml | 8 ++- test/models/customer_test.rb | 30 ++++++++- test/models/movie_test.rb | 30 ++++++++- test/models/rental_test.rb | 67 ++++++++++++++++++- 12 files changed, 151 insertions(+), 23 deletions(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..4cbb52557 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,7 @@ 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] + resources :movies, only: [:index, :show, :create] + + # post '/rentals/check-out', to: 'movies#checkout', as: 'checkout' + # post '/rentals/check-in', to: 'movies#checkin', as: 'checkin' end diff --git a/db/seeds.rb b/db/seeds.rb index a46e05ceb..29f74b295 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,10 +1,3 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). -# -# Examples: -# -# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) -# Character.create(name: 'Luke', movie: movies.first) JSON.parse(File.read('db/seeds/customers.json')).each do |customer| Customer.create!(customer) 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/customers.yml b/test/fixtures/customers.yml index a221c16cb..7f48a2fbb 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,6 +1,6 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +customerone: name: MyString registered_at: 2018-11-05 12:37:55 address: MyString @@ -9,7 +9,7 @@ one: postal_code: MyString phone: MyString -two: +customertwo: name: MyString registered_at: 2018-11-05 12:37:55 address: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f05dd0894..be36cf514 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,12 +1,12 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +movieone: title: MyString overview: MyString release_date: 2018-11-05 inventory: 1 -two: +movietwo: title: MyString overview: MyString release_date: 2018-11-05 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index d71d80707..ccaa4258b 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +rentalone: checkout_date: 2018-11-05 due_date: 2018-11-05 + movie: movieone + customer: customerone -two: +rentaltwo: checkout_date: 2018-11-05 due_date: 2018-11-05 + movie: movietwo + customer: customertwo diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..b9189ff60 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,33 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:customerone) } - it "must be valid" do - value(customer).must_be :valid? + describe "Validations" do + it "is valid when all fields are present" do + expect(customer).must_be :valid? + end + end + + describe "Relationships" do + it "can have many rentals" do + expect(customer.rentals.count).must_be :>=, 0 + end + + it "can have 0 rentals" do + customer = Customer.new + expect(customer.rentals.count).must_equal 0 + end + + it "can access movies through rentals" do + expect(customer.movies.length).must_be :>=, 0 + + customer.movies.each do |movie| + expect(movie).must_be_instance_of Movie + end + end + end + + describe "Custom Models" do end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..4735443f6 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,33 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:movieone) } - it "must be valid" do - value(movie).must_be :valid? + describe "Validations" do + it "is valid when all fields are present" do + expect(movie).must_be :valid? + end + end + + describe "Relationships" do + it "can have many rentals" do + expect(movie.rentals.count).must_be :>=, 0 + end + + it "can have 0 rentals" do + movie = Movie.new + expect(movie.rentals.count).must_equal 0 + end + + it "can access customers through rentals" do + expect(movie.customers.length).must_be :>=, 0 + + movie.customers.each do |customer| + expect(customer).must_be_instance_of Customer + end + end + end + + describe "Custom Models" do end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..96962f1d1 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,70 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:rentalone) } + let(:customertwo) { customers(:customertwo) } + let(:movietwo) { movies(:movietwo) } + + describe "Validations" do + it "won't be valid without customer_id or movie_id" do + rental = Rental.new + expect(rental).wont_be :valid? + end - it "must be valid" do - value(rental).must_be :valid? + it "will be valid given a customer_id and movie_id" do + expect(rental).must_be :valid? + end + + it "must have a customer_id" do + rental.customer_id = nil + + valid = rental.valid? + + expect(valid).must_equal false + expect(rental.errors.messages).must_include :customer + end + + it "must have a movie_id" do + rental.movie_id = nil + + valid = rental.valid? + + expect(valid).must_equal false + expect(rental.errors.messages).must_include :movie + end + + end + + describe "Relationships" do + it "belongs to a customer" do + expect(rental.customer).must_equal customers(:customerone) + end + + it "can set the user through .customer" do + rental.customer = customertwo + expect(rental.customer_id).must_equal customertwo.id + end + + it "can set the user through .customer_id" do + rental.customer_id = customertwo.id + expect(rental.customer).must_equal customertwo + end + + it "belongs to a movie" do + expect(rental.movie).must_equal movies(:movieone) + end + + it "can set the work through .movie" do + rental.movie = movietwo + expect(rental.movie_id).must_equal movietwo.id + end + + it "can set the work through .movie_id" do + rental.movie_id = movietwo.id + expect(rental.movie).must_equal movietwo + end + end + + describe "Custom Models" do end end From 3ec79d50a0636e2ca5c53e5b07cc7a3100cdb17f Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Mon, 5 Nov 2018 13:32:25 -0800 Subject: [PATCH 04/40] Added zomg to routes --- config/routes.rb | 1 + test/models/customer_test.rb | 2 ++ test/models/movie_test.rb | 3 +++ test/models/rental_test.rb | 12 +++++++----- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 4cbb52557..43af050a0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + # get "/zomg", to: "" # post '/rentals/check-out', to: 'movies#checkout', as: 'checkout' # post '/rentals/check-in', to: 'movies#checkin', as: 'checkin' end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index b9189ff60..5a43cbbec 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,5 +1,7 @@ require "test_helper" +# You should have at least one positive and one negative test case for each relation, validation, and custom function you add to your models. + describe Customer do let(:customer) { customers(:customerone) } diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 4735443f6..4efda15de 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,5 +1,7 @@ require "test_helper" +# You should have at least one positive and one negative test case for each relation, validation, and custom function you add to your models. + describe Movie do let(:movie) { movies(:movieone) } @@ -7,6 +9,7 @@ it "is valid when all fields are present" do expect(movie).must_be :valid? end + end describe "Relationships" do diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 96962f1d1..a07733092 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,10 +1,12 @@ require "test_helper" +# You should have at least one positive and one negative test case for each relation, validation, and custom function you add to your models. + describe Rental do let(:rental) { rentals(:rentalone) } let(:customertwo) { customers(:customertwo) } let(:movietwo) { movies(:movietwo) } - + describe "Validations" do it "won't be valid without customer_id or movie_id" do rental = Rental.new @@ -40,12 +42,12 @@ expect(rental.customer).must_equal customers(:customerone) end - it "can set the user through .customer" do + it "can set the rental through .customer" do rental.customer = customertwo expect(rental.customer_id).must_equal customertwo.id end - it "can set the user through .customer_id" do + it "can set the rental through .customer_id" do rental.customer_id = customertwo.id expect(rental.customer).must_equal customertwo end @@ -54,12 +56,12 @@ expect(rental.movie).must_equal movies(:movieone) end - it "can set the work through .movie" do + it "can set the rental through .movie" do rental.movie = movietwo expect(rental.movie_id).must_equal movietwo.id end - it "can set the work through .movie_id" do + it "can set the rental through .movie_id" do rental.movie_id = movietwo.id expect(rental.movie).must_equal movietwo end From 55fbfd0139b91d2193dcb35aa531df4d7e70d2cf Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 5 Nov 2018 13:54:00 -0800 Subject: [PATCH 05/40] completed writing validation tests --- app/models/customer.rb | 10 ++++++++- app/models/movie.rb | 7 +++++- app/models/rental.rb | 5 ++++- test/models/customer_test.rb | 42 ++++++++++++++++++++++++++++++++++++ test/models/movie_test.rb | 24 +++++++++++++++++++++ test/models/rental_test.rb | 12 +++++++++++ 6 files changed, 97 insertions(+), 3 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index b62bcbf04..c0136d68f 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,12 @@ class Customer < ApplicationRecord has_many :rentals - has_many :movies, through: :rentals + has_many :movies, through: :rentals + + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :state, presence: true + validates :postal_code, presence: true + validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index b2e4effc8..0533a1b45 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,9 @@ class Movie < ApplicationRecord has_many :rentals - has_many :customers, through: :rentals + has_many :customers, through: :rentals + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true end diff --git a/app/models/rental.rb b/app/models/rental.rb index f68df02af..dece82f83 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,7 @@ class Rental < ApplicationRecord belongs_to :customer - belongs_to :movie + belongs_to :movie + + validates :checkout_date, presence: true + validates :due_date, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5a43cbbec..3fe56bb7f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -9,6 +9,48 @@ it "is valid when all fields are present" do expect(customer).must_be :valid? end + + it "requires a name" do + customer.name = nil + customer.valid?.must_equal false + customer.errors.messages.must_include :name + end + + it "requires registered_at" do + customer.registered_at = nil + customer.valid?.must_equal false + customer.errors.messages.must_include :registered_at + end + + it "requires an address" do + customer.address = nil + customer.valid?.must_equal false + customer.errors.messages.must_include :address + end + + it "requires a city" do + customer.city = nil + customer.valid?.must_equal false + customer.errors.messages.must_include :city + end + + it "requires a state" do + customer.state = nil + customer.valid?.must_equal false + customer.errors.messages.must_include :state + end + + it "requires a postal_code" do + customer.postal_code = nil + customer.valid?.must_equal false + customer.errors.messages.must_include :postal_code + end + + it "requires a phone" do + customer.phone = nil + customer.valid?.must_equal false + customer.errors.messages.must_include :phone + end end describe "Relationships" do diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 4efda15de..7549e1cc6 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -10,6 +10,30 @@ expect(movie).must_be :valid? end + it "requires a title" do + movie.title = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :title + end + + it "requires a overview" do + movie.overview = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :overview + end + + it "requires a release_date" do + movie.release_date = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :release_date + end + + it "requires a inventory" do + movie.inventory = nil + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + end describe "Relationships" do diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index a07733092..30f4ba03d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -35,6 +35,18 @@ expect(rental.errors.messages).must_include :movie end + it "requires a checkout_date" do + rental.checkout_date = nil + rental.valid?.must_equal false + rental.errors.messages.must_include :checkout_date + end + + it "requires a due_date" do + rental.due_date = nil + rental.valid?.must_equal false + rental.errors.messages.must_include :due_date + end + end describe "Relationships" do From 00a4824dd44d5c3667fbd0e5a574b2a34ba1e39e Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 5 Nov 2018 13:58:59 -0800 Subject: [PATCH 06/40] rabl gem added --- Gemfile | 1 + Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index a9f49bedc..a855c5a99 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,7 @@ gem 'rails', '~> 5.2.1' gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server gem 'puma', '~> 3.11' +gem 'rabl', '~> 0.14.0' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production diff --git a/Gemfile.lock b/Gemfile.lock index 731ec7c93..32b4a6822 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,6 +92,8 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) puma (3.12.0) + rabl (0.14.0) + activesupport (>= 2.3.14) rack (2.0.5) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -157,6 +159,7 @@ DEPENDENCIES pg (>= 0.18, < 2.0) pry-rails puma (~> 3.11) + rabl (~> 0.14.0) rails (~> 5.2.1) spring spring-watcher-listen (~> 2.0.0) From 2ee517011f1c09bde0753c6a1ebfd974b2db23ee Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 5 Nov 2018 14:49:23 -0800 Subject: [PATCH 07/40] filled in movie controller index, show create, customer controller index, added rabl gem and added forgery protection to controllers --- app/controllers/customers_controller.rb | 14 +++++++++ app/controllers/movies_controller.rb | 39 +++++++++++++++++++++++++ app/views/customers/index.json.rabl | 0 app/views/movies/index.json.rabl | 0 app/views/movies/show.json.rabl | 0 5 files changed, 53 insertions(+) create mode 100644 app/views/customers/index.json.rabl create mode 100644 app/views/movies/index.json.rabl create mode 100644 app/views/movies/show.json.rabl diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..a8e9b5f3f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,16 @@ class CustomersController < ApplicationController + protect_from_forgery with: :null_session + + def index + @customers = Customer.all + + render json: @customers + end + + private + + def customer_params + params.require(:customer).permit(: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 6c4c51614..756450f00 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,41 @@ class MoviesController < ApplicationController + protect_from_forgery with: :null_session + + def index + @movies = Movie.all + + render json: @movies + end + + def show + @movie = Movie.find_by(id: params[:id]) + + if @movie.nil? + render json: { ok: false, message: 'not found' }, status: :not_found + else + render json: @movie(except: [:created_at, :updated_at]), status: :ok + end + end + + def create + @movie = Movie.new(movie_params) + + if @movie.save + render json: { ok: true, + movie = @movie.as_json(except: [:created_at, :updated_at])} + else + render json: { + ok: false, + message: @movie.errors.messages + }, status: :bad_request + end + + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end + end diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.json.rabl new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/movies/index.json.rabl b/app/views/movies/index.json.rabl new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.json.rabl new file mode 100644 index 000000000..e69de29bb From b1ede1fe94395627af65cf04e0e8bd30e0bf0ba6 Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 5 Nov 2018 15:01:45 -0800 Subject: [PATCH 08/40] fixed errors in movie and index controllers plus needed to remove forgery check in order for postman to work --- app/controllers/customers_controller.rb | 3 +-- app/controllers/movies_controller.rb | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a8e9b5f3f..7bd00b61c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,10 +1,9 @@ class CustomersController < ApplicationController - protect_from_forgery with: :null_session def index @customers = Customer.all - render json: @customers + render json: @customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) end private diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 756450f00..1dd16aee0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,10 +1,10 @@ class MoviesController < ApplicationController - protect_from_forgery with: :null_session + def index @movies = Movie.all - render json: @movies + render json: @movies.as_json(only: [:id, :title, :release_date]) end def show @@ -13,7 +13,7 @@ def show if @movie.nil? render json: { ok: false, message: 'not found' }, status: :not_found else - render json: @movie(except: [:created_at, :updated_at]), status: :ok + render json: @movie.as_json(except: [:created_at, :updated_at]), status: :ok end end @@ -22,13 +22,13 @@ def create if @movie.save render json: { ok: true, - movie = @movie.as_json(except: [:created_at, :updated_at])} + movie: @movie.as_json(except: [:created_at, :updated_at])} else render json: { ok: false, message: @movie.errors.messages }, status: :bad_request - end + end end From 176892a536e7404b4ce662e727913d61b082805d Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 5 Nov 2018 16:04:20 -0800 Subject: [PATCH 09/40] implemented rabl to format json views --- Gemfile | 1 + Gemfile.lock | 2 ++ app/controllers/movies_controller.rb | 4 ++-- app/views/customers/index.json.rabl | 1 + app/views/movies/index.json.rabl | 3 +++ app/views/movies/show.json.rabl | 17 +++++++++++++++++ config/initializers/rabl_config.rb | 5 +++++ 7 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 config/initializers/rabl_config.rb diff --git a/Gemfile b/Gemfile index a855c5a99..941be17d7 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server gem 'puma', '~> 3.11' gem 'rabl', '~> 0.14.0' +gem 'oj' # 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 diff --git a/Gemfile.lock b/Gemfile.lock index 32b4a6822..e29140447 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,6 +85,7 @@ GEM nio4r (2.3.1) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) + oj (3.7.0) pg (1.1.3) pry (0.12.0) coderay (~> 1.1.0) @@ -156,6 +157,7 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) minitest-rails minitest-reporters + oj pg (>= 0.18, < 2.0) pry-rails puma (~> 3.11) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1dd16aee0..6e7f5a879 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -4,7 +4,7 @@ class MoviesController < ApplicationController def index @movies = Movie.all - render json: @movies.as_json(only: [:id, :title, :release_date]) + # render json: @movies.as_json(only: [:id, :title, :release_date]) end def show @@ -13,7 +13,7 @@ def show if @movie.nil? render json: { ok: false, message: 'not found' }, status: :not_found else - render json: @movie.as_json(except: [:created_at, :updated_at]), status: :ok + render :show end end diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.json.rabl index e69de29bb..5c3f7007b 100644 --- a/app/views/customers/index.json.rabl +++ b/app/views/customers/index.json.rabl @@ -0,0 +1 @@ +collection @customers diff --git a/app/views/movies/index.json.rabl b/app/views/movies/index.json.rabl index e69de29bb..384d1c219 100644 --- a/app/views/movies/index.json.rabl +++ b/app/views/movies/index.json.rabl @@ -0,0 +1,3 @@ +collection @movies + +attributes :id, :title, :release_date diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.json.rabl index e69de29bb..24cfe572e 100644 --- a/app/views/movies/show.json.rabl +++ b/app/views/movies/show.json.rabl @@ -0,0 +1,17 @@ +object @movie + +if @movie.nil? + node(:ok) { false } + node(:message) { "not found" } +else + node(:ok) { true } + attributes :title, :overview, :release_date, :inventory + + child :rentals do + attributes :id, :checkout_date, :due_date + end + + child :customers do + attributes :id, :name + end +end diff --git a/config/initializers/rabl_config.rb b/config/initializers/rabl_config.rb new file mode 100644 index 000000000..426b8b41c --- /dev/null +++ b/config/initializers/rabl_config.rb @@ -0,0 +1,5 @@ +require 'rabl' +Rabl.configure do |config| + # config.include_json_root = false + config.include_child_root = false +end From c49b66e1bf45e8ce2263ba041ece3495b6f9975d Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Mon, 5 Nov 2018 16:39:18 -0800 Subject: [PATCH 10/40] Implemented Rabl for both customers and movies controller --- app/controllers/customers_controller.rb | 2 -- app/controllers/movies_controller.rb | 16 ++-------------- app/views/customers/index.json.rabl | 2 ++ app/views/movies/errors.json.rabl | 5 +++++ app/views/movies/show.json.rabl | 16 ++++++++-------- 5 files changed, 17 insertions(+), 24 deletions(-) create mode 100644 app/views/movies/errors.json.rabl diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 7bd00b61c..4ce2f7742 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,8 +2,6 @@ class CustomersController < ApplicationController def index @customers = Customer.all - - render json: @customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) end private diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6e7f5a879..d2fc811bc 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,31 +3,19 @@ class MoviesController < ApplicationController def index @movies = Movie.all - - # render json: @movies.as_json(only: [:id, :title, :release_date]) end def show @movie = Movie.find_by(id: params[:id]) - - if @movie.nil? - render json: { ok: false, message: 'not found' }, status: :not_found - else - render :show - end end def create @movie = Movie.new(movie_params) if @movie.save - render json: { ok: true, - movie: @movie.as_json(except: [:created_at, :updated_at])} + render "movies/show.json", status: :ok else - render json: { - ok: false, - message: @movie.errors.messages - }, status: :bad_request + render "movies/errors.json", status: :bad_request end end diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.json.rabl index 5c3f7007b..abdf835ac 100644 --- a/app/views/customers/index.json.rabl +++ b/app/views/customers/index.json.rabl @@ -1 +1,3 @@ collection @customers + +attributes :id, :name, :registered_at, :postal_code, :phone diff --git a/app/views/movies/errors.json.rabl b/app/views/movies/errors.json.rabl new file mode 100644 index 000000000..1840690bc --- /dev/null +++ b/app/views/movies/errors.json.rabl @@ -0,0 +1,5 @@ +object @movie + +node(:errors) { |movie| + movie.errors.messages +} diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.json.rabl index 24cfe572e..cca7ebb85 100644 --- a/app/views/movies/show.json.rabl +++ b/app/views/movies/show.json.rabl @@ -5,13 +5,13 @@ if @movie.nil? node(:message) { "not found" } else node(:ok) { true } - attributes :title, :overview, :release_date, :inventory + attributes :id, :title, :overview, :release_date, :inventory - child :rentals do - attributes :id, :checkout_date, :due_date - end - - child :customers do - attributes :id, :name - end + # child :rentals do + # attributes :id, :checkout_date, :due_date + # end + # + # child :customers do + # attributes :id, :name + # end end From 7acb2acccc28624d9e6415c976c9ffff1452c940 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Mon, 5 Nov 2018 16:50:38 -0800 Subject: [PATCH 11/40] Moved logic to controller --- app/controllers/movies_controller.rb | 6 ++++++ app/views/movies/notfound.json.rabl | 2 ++ app/views/movies/show.json.rabl | 23 +++++++++-------------- config/initializers/rabl_config.rb | 2 +- 4 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 app/views/movies/notfound.json.rabl diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d2fc811bc..22ce4816b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,6 +7,12 @@ def index def show @movie = Movie.find_by(id: params[:id]) + + if @movie.nil? + render "movies/notfound.json", status: :not_found + else + render "movies/show.json", status: :ok + end end def create diff --git a/app/views/movies/notfound.json.rabl b/app/views/movies/notfound.json.rabl new file mode 100644 index 000000000..0394b286c --- /dev/null +++ b/app/views/movies/notfound.json.rabl @@ -0,0 +1,2 @@ +node(:ok) { false } +node(:message) { "not found" } diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.json.rabl index cca7ebb85..affa576d9 100644 --- a/app/views/movies/show.json.rabl +++ b/app/views/movies/show.json.rabl @@ -1,17 +1,12 @@ object @movie -if @movie.nil? - node(:ok) { false } - node(:message) { "not found" } -else - node(:ok) { true } - attributes :id, :title, :overview, :release_date, :inventory +node(:ok) { true } +attributes :id, :title, :overview, :release_date, :inventory - # child :rentals do - # attributes :id, :checkout_date, :due_date - # end - # - # child :customers do - # attributes :id, :name - # end -end +# child :rentals do +# attributes :id, :checkout_date, :due_date +# end +# +# child :customers do +# attributes :id, :name +# end diff --git a/config/initializers/rabl_config.rb b/config/initializers/rabl_config.rb index 426b8b41c..75e89437a 100644 --- a/config/initializers/rabl_config.rb +++ b/config/initializers/rabl_config.rb @@ -1,5 +1,5 @@ require 'rabl' Rabl.configure do |config| - # config.include_json_root = false + config.include_json_root = false config.include_child_root = false end From 5b870792ab9d327be506a77a0362c22806bf0780 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Mon, 5 Nov 2018 18:00:41 -0800 Subject: [PATCH 12/40] Wave 2 Smoke Test Passes --- app/controllers/movies_controller.rb | 4 +- app/views/customers/index.json.rabl | 2 +- app/views/movies/show.json.rabl | 2 +- ...10533_add_available_inventory_to_movies.rb | 5 + ...1106015850_add_movies_checked_out_count.rb | 5 + db/schema.rb | 4 +- db/seeds/movies.json | 270 ++++++++++++------ 7 files changed, 197 insertions(+), 95 deletions(-) create mode 100644 db/migrate/20181106010533_add_available_inventory_to_movies.rb create mode 100644 db/migrate/20181106015850_add_movies_checked_out_count.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 22ce4816b..525c94167 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,7 +7,7 @@ def index def show @movie = Movie.find_by(id: params[:id]) - + if @movie.nil? render "movies/notfound.json", status: :not_found else @@ -29,7 +29,7 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.json.rabl index abdf835ac..8926c1cb7 100644 --- a/app/views/customers/index.json.rabl +++ b/app/views/customers/index.json.rabl @@ -1,3 +1,3 @@ collection @customers -attributes :id, :name, :registered_at, :postal_code, :phone +attributes :id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.json.rabl index affa576d9..422b68cd7 100644 --- a/app/views/movies/show.json.rabl +++ b/app/views/movies/show.json.rabl @@ -1,7 +1,7 @@ object @movie node(:ok) { true } -attributes :id, :title, :overview, :release_date, :inventory +attributes :id, :title, :overview, :release_date, :inventory, :available_inventory # child :rentals do # attributes :id, :checkout_date, :due_date diff --git a/db/migrate/20181106010533_add_available_inventory_to_movies.rb b/db/migrate/20181106010533_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..0f98e4d8f --- /dev/null +++ b/db/migrate/20181106010533_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer, default: :inventory + end +end diff --git a/db/migrate/20181106015850_add_movies_checked_out_count.rb b/db/migrate/20181106015850_add_movies_checked_out_count.rb new file mode 100644 index 000000000..a817a398c --- /dev/null +++ b/db/migrate/20181106015850_add_movies_checked_out_count.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCount < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index aca155690..67ee63f09 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_204158) do +ActiveRecord::Schema.define(version: 2018_11_06_015850) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -34,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end create_table "rentals", force: :cascade do |t| diff --git a/db/seeds/movies.json b/db/seeds/movies.json index de0db0c5e..89cabf0be 100644 --- a/db/seeds/movies.json +++ b/db/seeds/movies.json @@ -3,540 +3,630 @@ "title":"Blacksmith Of The Banished", "overview":"The unexciting life of a boy will be permanently altered as a strange woman enters his life.", "release_date":"1979-01-18", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Savior Of The Curse", "overview":"The strange woman claims the boy has a DNA strain which very likely offers the key to cure several crippling diseases. Tests will have to be done, but the key to save millions of lives is within the grasp of science through this DNA strain. Unsure what to think of all this and of this strange woman, the boy hesitantly agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made.", "release_date":"2010-11-05", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Women Of Destruction", "overview":"But what if this strange woman is a con artist. Or what if everything told is completely true. How could an ordinary boy be relied upon in something this big. Time will tell.", "release_date":"2006-10-01", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Robots Of Eternity", "overview":"The laid-back life of a woman is going in a different direction as a childhood friend enters her life.", "release_date":"2007-10-10", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Rats And Strangers", "overview":"The childhood friend claims the woman is heir to an incredible fortune, all paperwork has been taken care of already, all there's left to do is sign them. Distrustful of both this situation and of this childhood friend, the woman somewhat gladly agrees to the proposal, but there's no time to waste, a decision had to be made quickly.", "release_date":"2012-09-25", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Soldiers And Gangsters", "overview":"But what if this childhood friend is just a crazy person. Or what if the complete opposite is true. How could an ordinary woman be relied upon in something this big. No turning back now though.", "release_date":"1948-03-31", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Body Of Utopia", "overview":"The peaceful life of a teenage girl is going the complete opposite way as a stranger enters her life.", "release_date":"1967-10-25", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Faith Of The Ancestors", "overview":"The stranger claims the teenage girl is now part of a murder investigation and might be the number one suspect, no arrest will be made in front of possible friends and neighbors if there's no resistance. Concerned of the situation and a little distrustful of this stranger, the teenage girl tentatively agrees to the proposal, no matter what, something has to be done in this situation, hopefully this was the right choice.", "release_date":"1953-10-05", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Traces In The Leaders", "overview":"But what if this stranger cannot be relied upon. Or what if somebody is orchestrating all of this. How could an ordinary teenage girl figure out the truth in all of this. Either way, the choice has been made.", "release_date":"1970-11-03", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Bathing In The Void", "overview":"The stressful life of a girl changes for better or worse as a stranger enters her life.", "release_date":"2013-09-13", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Mouse Of My House", "overview":"The stranger claims the girl is now cursed along with everybody else in this town. Why? By whom? What kind of curse exactly? Nobody seems to know, but the person supposedly responsible for this curse will explain everything at the town hall this afternoon, everybody should come. Unsure what to think of all this and of this stranger, the girl cautiously agrees to the proposal, it all seemed rather odd, but there was no time to waste and a choice had to be made.", "release_date":"1993-12-27", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Baby Of Tomorrow", "overview":"But what if this stranger is trying be misleading. Or what if the complete opposite is true. How could an ordinary girl find out what's happening without help. Only one way to find out.", "release_date":"1977-03-23", - "inventory":4 + "inventory":4, + "available_inventory":4 }, { "title":"Cats Of Wonder", "overview":"The carefree life of a young girl will change forever as a neighbor enters her life.", "release_date":"1939-03-13", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Kittens Of Excelsior", "overview":"The neighbor claims the young girl better leave the city now. The rivaling gangs have spiraled into an all out war, soon the entire city will be a battleground and the government apparently plans to surround the city and let the gangs fight it out, better to let them kill each other than risk soldier lives they say. Unsure what to think of all this and of this neighbor, the young girl oddly willingly agrees to the proposal, the situation is all too strange, it's best to get more information as soon as possible.", "release_date":"1965-06-10", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Dinos And Boys", "overview":"But what if this neighbor can't be trusted. Or what if all this is an elaborate trap. How could an ordinary young girl be this lucky, or unlucky, depending on the turnout. No turning back now though.", "release_date":"1973-10-20", - "inventory":0 + "inventory":0, + "available_inventory":0 }, { "title":"Tigers And Kids", "overview":"The secluded life of a elderly woman is going in a different direction as a friendly acquaintance enters her life.", "release_date":"2007-03-17", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Wand Of My Country", "overview":"The friendly acquaintance claims the elderly woman is needed, all capable hands are needed. The dam is breaking and if we don't get every person working on repairing it the entire town might be destroyed by the following flood. Concerned of the situation and a little distrustful of this friendly acquaintance, the elderly woman oddly enthusiastically agrees to the proposal, there must be truth to all this and if so, this was the right choice to make.", "release_date":"1960-06-26", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Tales Of My Imagination", "overview":"But what if this friendly acquaintance is pulling a prank. Or what if the wrong person was picked for this. How could an ordinary elderly woman play a part in all this. No turning back now though.", "release_date":"1985-09-21", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Learning With My Home", "overview":"The calm life of a elderly man is going the complete opposite way as a strange boy enters his life.", "release_date":"1939-09-01", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Fearless With My Home", "overview":"The strange boy claims the elderly man is one of the rare few people in possession of a guardian animal spirit. It's widely known these exist and rituals are held on a near weekly basis to connect with these guardian spirits, now its time to be the center of that ritual. Unconvinced of the situation, but trusting of this strange boy, the elderly man hesitantly agrees to the proposal, there's no way this is all a lie, right? If it is, a terrible choice might have been made.", "release_date":"1965-03-28", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Thief Without A Conscience", "overview":"But what if this strange boy can't be trusted. Or what if there's a change of mind. How could an ordinary elderly man be this important to the situation. Time to find out.", "release_date":"1982-11-14", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Knight Of Last Rites", "overview":"The normal life of a girl will be changed completely as a strange man enters her life.", "release_date":"1973-12-16", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Horses With Hoods", "overview":"The strange man claims the girl plays a vital role in the future, but that this version of the future cannot be allowed to be. The only way to prevent it is by traveling in time with this supposed time traveler. Sure of the truth in this situation, but somewhat distrustful of this strange man, the girl somewhat hesitantly agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date":"1965-09-16", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Heirs With Gold", "overview":"But what if this strange man cannot be relied upon. Or what if all this is an elaborate trap. How could an ordinary girl be relied upon in something this big. Only one way to find out.", "release_date":"1949-10-03", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Scientists And Rats", "overview":"The ordinary life of a young guy take a sharp turn as a childhood friend enters his life.", "release_date":"1973-11-07", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Invaders And Guardians", "overview":"The childhood friend claims the young guy is in possession of a powerful artifact, an artifact which looks like any ordinary object, but an artifact which is of the utmost importance to this person, who will offer a reward for it. Sure of the truth in this situation, but somewhat distrustful of this childhood friend, the young guy oddly willingly agrees to the proposal, if all this turns out to be false, this choice will seem foolish, but it's still worth checking out.", "release_date":"1990-06-04", - "inventory":0 + "inventory":0, + "available_inventory":0 }, { "title":"Accidents Of Hell", "overview":"But what if this childhood friend is a con artist. Or what if everything told is completely true. How could an ordinary young guy be relied upon in something this big. We're about to find out.", "release_date":"1944-03-24", - "inventory":4 + "inventory":4, + "available_inventory":4 }, { "title":"Confinement Of War", "overview":"The fast-paced life of a teenage girl changes in an instant as a friendly acquaintance enters her life.", "release_date":"1959-04-06", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Breath Of The Apocalypse", "overview":"The friendly acquaintance claims the teenage girl is actually already dead, a spirit trapped in a state of denial, not ready to move on yet. The person claims there's proof of this elsewhere. Sure of the truth in this situation, but somewhat distrustful of this friendly acquaintance, the teenage girl oddly willingly agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made.", "release_date":"1965-06-10", - "inventory":5 + "inventory":5, + "available_inventory":5 }, { "title":"Force Of A Storm", "overview":"But what if this friendly acquaintance cannot be relied upon. Or what if there's a change of mind. How could an ordinary teenage girl find out what's happening without help. Time to find out.", "release_date":"1972-03-25", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Officer Without Fear", "overview":"The ordinary life of a woman changes for better or worse as a strange woman enters her life.", "release_date":"1987-03-06", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Spider Of The Gods", "overview":"The strange woman claims the woman was a witness of a horrific crime, a crime for which an innocent person is in jail for. Due to the horrific nature of the crime the memory was likely blocked, but there's a way to unblock it and save an innocent life. Unconvinced of the situation, but trusting of this strange woman, the woman somewhat keenly agrees to the proposal, the situation is all too strange, it's best to get more information as soon as possible.", "release_date":"2010-01-16", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Women Of Insanity", "overview":"But what if this strange woman can't be trusted. Or what if the complete opposite is true. How could an ordinary woman end up in a situation like this. Only one way to find out.", "release_date":"1997-10-03", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Doctors Of Water", "overview":"The stable life of a teenage girl changes for better or worse as a stranger enters her life.", "release_date":"1953-04-03", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Snakes And Turtles", "overview":"The stranger claims the teenage girl better leave the city now. The rivaling gangs have spiraled into an all out war, soon the entire city will be a battleground and the government apparently plans to surround the city and let the gangs fight it out, better to let them kill each other than risk soldier lives they say. Suspicious of this situation, but somewhat trusting of this stranger, the teenage girl unusually eagerly agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date":"1992-12-14", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Rogues And Boys", "overview":"But what if this stranger is pulling a prank. Or what if all this is an elaborate trap. How could an ordinary teenage girl find out what's happening without help. We're about to find out.", "release_date":"1979-12-30", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Loss Of The Sea", "overview":"The relaxed life of a boy will change forever as a lost friend enters his life.", "release_date":"1976-07-16", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Annihilation Of Autumn", "overview":"The lost friend claims the boy is in possession of a powerful artifact, one which looks like any other object, but one which could bring total destruction if fallen in the wrong hands. The person wishes to destroy it, with or without help. Unconvinced of the situation, but trusting of this lost friend, the boy oddly enthusiastically agrees to the proposal, it might be a mistake, but both options could've been the mistake, one had to be chosen.", "release_date":"2016-11-09", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Searching At The Leaders", "overview":"But what if this lost friend is trying be misleading. Or what if the situation has changed or will change. How could an ordinary boy be this important to the situation. We're about to find out.", "release_date":"1995-12-21", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Taste Of The Immortals", "overview":"The rough life of a young girl might turn out differently as a strange woman enters her life.", "release_date":"1948-02-12", - "inventory":5 + "inventory":5, + "available_inventory":5 }, { "title":"Criminal Arrangement", "overview":"The strange woman claims the young girl is now cursed along with everybody else in this town. Why? By whom? What kind of curse exactly? Nobody seems to know, but the person supposedly responsible for this curse will explain everything at the town hall this afternoon, everybody should come. Unsure what to think of all this and of this strange woman, the young girl somewhat grudgingly agrees to the proposal, it's probably best to get to the bottom of this as soon as possible.", "release_date":"1939-04-23", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Spider In The Window", "overview":"But what if this strange woman is a con artist. Or what if the complete opposite is true. How could an ordinary young girl find out what's happening without help. Either way, the choice has been made.", "release_date":"2007-06-29", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Comedian Makeover", "overview":"The laid-back life of a young girl changes in an instant as a childhood friend enters her life.", "release_date":"1944-06-14", - "inventory":4 + "inventory":4, + "available_inventory":4 }, { "title":"Baker On A Day Out", "overview":"The childhood friend claims the young girl is in for a fun day. A new casino opened up in town and is giving everybody a free roll on their slot machine, with a little luck who knows what could happen. Skeptical of this situation and of this childhood friend, the young girl cautiously agrees to the proposal, if anything this will at least speed things up, for better and for worse.", "release_date":"1948-07-26", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Spider And Thief", "overview":"But what if this childhood friend is just a crazy person. Or what if everything told is completely true. How could an ordinary young girl be this lucky, or unlucky, depending on the turnout. No turning back now though.", "release_date":"1950-05-07", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Rat And Chicken", "overview":"The carefree life of a elderly man will change forever as a strange woman enters his life.", "release_date":"1993-10-05", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Laughing Stalks Me", "overview":"The strange woman claims the elderly man is now the citizen of a different country. The old country has just been taken over by an enemy force, everybody who wishes to leave this new nation has 3 days to do so. Distrustful of both this situation and of this strange woman, the elderly man tentatively agrees to the proposal, this whole situation is both exciting and terrifying at the same time, but surely the right choice was made.", "release_date":"1946-09-06", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Fools Can Cook", "overview":"But what if this strange woman is a con artist. Or what if this proposal is wrong or missing important details. How could an ordinary elderly man be this important to the situation. Only one way to find out.", "release_date":"2013-11-20", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Power Of The Project", "overview":"The unexciting life of a teenage boy is going in a different direction as a lost friend enters his life.", "release_date":"1982-02-19", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Intelligence Of My Teacher", "overview":"The lost friend claims the teenage boy is in possession of a powerful artifact, one which looks like any other object, but one which could bring total destruction if fallen in the wrong hands. The person wishes to destroy it, with or without help. Unsure what to think of all this and of this lost friend, the teenage boy somewhat hesitantly agrees to the proposal, this whole situation is both exciting and terrifying at the same time, but surely the right choice was made.", "release_date":"2017-02-18", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Priest Of Outer Space", "overview":"But what if this lost friend speaks only lies. Or what if the situation has changed or will change. How could an ordinary teenage boy come out of this situation in a better way. No turning back now though.", "release_date":"1975-12-06", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Spy Of A Dog", "overview":"The secluded life of a teenage girl take a sharp turn as a stranger enters her life.", "release_date":"1972-11-18", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Enemies Of The Mountain", "overview":"The stranger claims the teenage girl is in for a treat this afternoon. Supposedly this strange person has discovered a way to unlock the hidden potentials of the brain and will show the whole town this afternoon, it's not an event you want to miss. Concerned of the situation and a little distrusful of this stranger, the teenage girl tentatively agrees to the proposal, if anything this will at least speed things up, for better and for worse.", "release_date":"1956-10-16", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Lions Of Tomorrow", "overview":"But what if this stranger is wrong about all this. Or what if this proposal is wrong or missing important details. How could an ordinary teenage girl be helpful at all in this situation. Either way, the choice has been made.", "release_date":"1983-07-03", - "inventory":4 + "inventory":4, + "available_inventory":4 }, { "title":"Serpents And Kings", "overview":"The stable life of a elderly man might be changing forever as a friendly acquaintance enters his life.", "release_date":"2016-09-08", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Agents And Robots", "overview":"The friendly acquaintance claims the elderly man plays a vital role in the future, but that this version of the future cannot be allowed to be. The only way to prevent it is by traveling in time with this supposed time traveler. Sure of the truth in this situation, but somewhat distrustful of this friendly acquaintance, the elderly man oddly enthusiastically agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date":"1964-06-19", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Death Of The Mountain", "overview":"But what if this friendly acquaintance is trying be misleading. Or what if the complete opposite is true. How could an ordinary elderly man be needed for a situation like this. Time will tell.", "release_date":"1973-07-22", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Picture Of The Lake", "overview":"The casual life of a woman will change forever as a friendly acquaintance enters her life.", "release_date":"2014-10-19", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Muted By The River", "overview":"The friendly acquaintance claims the woman is actually already dead, a spirit trapped in a state of denial, not ready to move on yet. The person claims there's proof of this elsewhere. Sure of the truth in this situation, but somewhat distrustful of this friendly acquaintance, the woman hastily agrees to the proposal, there's something exciting about this whole situation, surely the right choice was made.", "release_date":"1992-10-23", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Young In The Chasm", "overview":"But what if this friendly acquaintance cannot be relied upon. Or what if the complete opposite is true. How could an ordinary woman be this important to the situation. Time to find out.", "release_date":"1948-05-21", - "inventory":2 + "inventory":2, + "available_inventory":2 }, { "title":"Politicians Of The East", "overview":"The normal life of a girl might be changing forever as a new friend enters her life.", "release_date":"2010-11-30", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Women Of Science", "overview":"The new friend claims the girl is the 'chosen one' according to an ancient prophecy. The prophecy states the chosen one will save the world, but only if properly trained. There is no time to waste. Distrustful of both this situation and of this new friend, the girl somewhat reluctantly agrees to the proposal, there's no way this is all a lie, right? If it is, a terrible choice might have been made.", "release_date":"1956-04-02", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Preys Of The North", "overview":"But what if this new friend is trying to manipulate the situation. Or what if everything told is completely true. How could an ordinary girl come out of this situation in a better way. No turning back now though.", "release_date":"1957-07-12", - "inventory":5 + "inventory":5, + "available_inventory":5 }, { "title":"Kings Of Medicine", "overview":"The nonchalant life of a woman might turn out differently as a strange woman enters her life.", "release_date":"1966-12-22", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Stars And Sinners", "overview":"The strange woman claims the woman is actually the rightful heir to the throne, this information has obviously been kept secret by the current holders of the throne, but once this information gets out to the public the people will surely stand behind the true heir. Concerned of the situation and a little distrusful of this strange woman, the woman somewhat hesitantly agrees to the proposal, surely this was the right choice to make, all of this has to have some truth to it.", "release_date":"1985-08-30", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Fungi And Amphibians", "overview":"But what if this strange woman is trying to manipulate the situation. Or what if the wrong person was picked for this. How could an ordinary woman be this lucky, or unlucky, depending on the turnout. Either way, the choice has been made.", "release_date":"1971-02-07", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Wonders Of The Hunt", "overview":"The laid-back life of a young guy has a chance to change, for better or worse, as a strange girl enters his life.", "release_date":"1978-04-01", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Crimes Of The Mountains", "overview":"The strange girl claims the young guy is now part of a murder investigation and might be the number one suspect, no arrest will be made in front of possible friends and neighbors if there's no resistance. Suspicious of this situation, but somewhat trusting of this strange girl, the young guy oddly willingly agrees to the proposal, it all seemed rather odd, but there was no time to waste and a choice had to be made.", "release_date":"1959-01-29", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Hidden The Swamps", "overview":"But what if this strange girl is wrong about all this. Or what if all this is an elaborate trap. How could an ordinary young guy be needed for a situation like this. We're about to find out.", "release_date":"1951-02-19", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Love For Women", "overview":"The carefree life of a boy changes for better or worse as a friendly acquaintance enters his life.", "release_date":"1952-02-24", - "inventory":5 + "inventory":5, + "available_inventory":5 }, { "title":"Boyfriend Of The Evening", "overview":"The friendly acquaintance claims the boy has a DNA strain which very likely offers the key to cure several crippling diseases. Tests will have to be done, but the key to save millions of lives is within the grasp of science through this DNA strain. Skeptical of this situation and of this friendly acquaintance, the boy oddly willingly agrees to the proposal, it was probably a good idea to make a quick decision anyway.", "release_date":"1973-02-27", - "inventory":0 + "inventory":0, + "available_inventory":0 }, { "title":"Man Of Dawn", "overview":"But what if this friendly acquaintance is a con artist. Or what if somebody is orchestrating all of this. How could an ordinary boy play a part in all this. Either way, the choice has been made.", "release_date":"1960-07-16", - "inventory":5 + "inventory":5, + "available_inventory":5 }, { "title":"Trueloves With Freckles", "overview":"The fast-paced life of a elderly man will be permanently altered as a strange girl enters his life.", "release_date":"1977-11-06", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Girlfriends In The Forest", "overview":"The strange girl claims the elderly man will need to find a new home as this current house will be demolished by the government in order to make room for a highway. A large sum of money will be paid if the house is left within a week. Distrustful of both this situation and of this strange girl, the elderly man somewhat keenly agrees to the proposal, there must be truth to all this and if so, this was the right choice to make.", "release_date":"2009-05-03", - "inventory":0 + "inventory":0, + "available_inventory":0 }, { "title":"Queens And Trueloves", "overview":"But what if this strange girl is pulling a prank. Or what if everything told is completely true. How could an ordinary elderly man be helpful at all in this situation. Time to find out.", "release_date":"1962-06-22", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Foreigners And Neighbors", "overview":"The calm life of a young girl might turn out differently as a strange boy enters her life.", "release_date":"2005-02-28", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Name Of Fortune", "overview":"The strange boy claims the young girl was a witness of a horrific crime, a crime for which an innocent person is in jail for. Due to the horrific nature of the crime the memory was likely blocked, but there's a way to unblock it and save an innocent life. Suspicious of this situation, but somewhat trusting of this strange boy, the young girl somewhat reluctantly agrees to the proposal, there's no way this is all a lie, right? If it is, a terrible choice might have been made.", "release_date":"1953-04-19", - "inventory":1 + "inventory":1, + "available_inventory":1 }, { "title":"Edge Of Tomorrow", "overview":"But what if this strange boy can't be trusted. Or what if the wrong person was picked for this. How could an ordinary young girl be this lucky, or unlucky, depending on the turnout. Time to find out.", "release_date":"2008-03-12", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Punished By The Stars", "overview":"The secluded life of a elderly woman is going in a different direction as a childhood friend enters her life.", "release_date":"2004-09-13", - "inventory":9 + "inventory":9, + "available_inventory":9 }, { "title":"Guarded By My Dreams", "overview":"The childhood friend claims the elderly woman is actually part of a 'sub-species' of humans with hidden powers and wants to show what these hidden powers can do. Unsure about everything, including this childhood friend, the elderly woman somewhat gladly agrees to the proposal, but something does feel very wrong about this whole situation, hopefully the right choice was made.", "release_date":"1986-04-26", - "inventory":11 + "inventory":11, + "available_inventory":11 }, { "title":"Man Of Exploration", "overview":"But what if this childhood friend is a con artist. Or what if this proposal is wrong or missing important details. How could an ordinary elderly woman figure out the truth in all of this. Only one way to find out.", "release_date":"2011-04-28", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Leader Of New Earth", "overview":"The normal life of a young girl changes for better or worse as a strange man enters her life.", "release_date":"1955-10-14", - "inventory":8 + "inventory":8, + "available_inventory":8 }, { "title":"Guardians Of Eternity", "overview":"The strange man claims the young girl has been chosen to compete against others of other regions in a 'competition'. The winner will gain not only the honor and glory of winning, but will also never need for anything for the rest of their life. Certain of the truth in this situation and of this strange man, the young girl somewhat reluctantly agrees to the proposal, there must be truth to all this and if so, this was the right choice to make.", "release_date":"1946-12-27", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Soldiers Of The Outlands", "overview":"But what if this strange man is wrong about all this. Or what if all this is an elaborate trap. How could an ordinary young girl end up in a situation like this. Either way, the choice has been made.", "release_date":"1939-03-20", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Leaders And Commanders", "overview":"The quiet life of a elderly man changes in an instant as a childhood friend enters his life.", "release_date":"1982-03-15", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Medics And Strangers", "overview":"The childhood friend claims the elderly man is actually the rightful heir to the throne, this information has obviously been kept secret by the current holders of the throne, but once this information gets out to the public the people will surely stand behind the true heir. Skeptical of this situation and of this childhood friend, the elderly man hesitantly agrees to the proposal, it all seemed rather odd, but there was no time to waste and a choice had to be made.", "release_date":"2007-03-13", - "inventory":6 + "inventory":6, + "available_inventory":6 }, { "title":"Beginning Of The Vacuum", "overview":"But what if this childhood friend is just a crazy person. Or what if all this is an elaborate trap. How could an ordinary elderly man be needed for a situation like this. Time will tell.", "release_date":"1943-11-11", - "inventory":3 + "inventory":3, + "available_inventory":3 }, { "title":"Fate Of Alien Life", "overview":"The normal life of a girl might be changing forever as a neighbor enters her life.", "release_date":"1938-12-01", - "inventory":10 + "inventory":10, + "available_inventory":10 }, { "title":"Created By Androids", "overview":"The neighbor claims the girl plays a vital role in the survival of the universe and must come along to train for battle or else the universe might be lost forever. Unsure about everything, including this neighbor, the girl hesitantly agrees to the proposal, the choice was made fast, perhaps too fast, but this situation requires quick thinking.", "release_date":"1963-04-16", - "inventory":7 + "inventory":7, + "available_inventory":7 }, { "title":"Elegance Of The Machines", "overview":"But what if this neighbor is wrong about all this. Or what if the situation is worse than it appears. How could an ordinary girl be this lucky, or unlucky, depending on the turnout. We're about to find out.", "release_date":"1991-05-19", - "inventory":7 + "inventory":7, + "available_inventory":7 } ] From f89c559216eef60f94616db5871d6fa7bf5e9eeb Mon Sep 17 00:00:00 2001 From: Hannah Date: Tue, 6 Nov 2018 11:27:10 -0800 Subject: [PATCH 13/40] controller tests for customers and movies --- app/controllers/movies_controller.rb | 2 - test/controllers/customers_controller_test.rb | 41 ++++++- test/controllers/movies_controller_test.rb | 113 +++++++++++++++++- 3 files changed, 148 insertions(+), 8 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 525c94167..77dc63b0d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,6 +1,5 @@ class MoviesController < ApplicationController - def index @movies = Movie.all end @@ -17,7 +16,6 @@ def show def create @movie = Movie.new(movie_params) - if @movie.save render "movies/show.json", status: :ok else diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..9afc9cd7a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,42 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + let(:customer) {customers(:customertwo)} + describe "index" do + it "is a real working route and returns JSON" do + get customers_path, as: :json + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "returns an array" do + get customers_path, as: :json + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path, as: :json + + body = JSON.parse(response.body) + + expect(body.length).must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + fields = %w(id movies_checked_out_count name phone postal_code registered_at) + + get customers_path, as: :json + + body = JSON.parse(response.body) + + body.each do |customer| + expect(customer.keys.sort).must_equal fields + expect(customer.keys.length).must_equal fields.length + end + end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..587c3d64c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,114 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + let(:movie) {movies(:movietwo)} + describe "index" do + it "is a real working route and returns JSON" do + get movies_path, as: :json + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "returns an array" do + get movies_path, as: :json + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_path, as: :json + + body = JSON.parse(response.body) + + expect(body.length).must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + fields = %w(id release_date title) + + get movies_path, as: :json + + body = JSON.parse(response.body) + + body.each do |movie| + expect(movie.keys.sort).must_equal fields + expect(movie.keys.length).must_equal fields.length + end + end + end + + describe "show" do + + it "is a real working route and returns JSON" do + # Act + get movie_path(movie.id), as: :json + + # Assert + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "can get a movie with a valid id" do + get movie_path(movie.id), as: :json + + code = JSON.parse(response.code) + + + must_respond_with :success + expect(code).must_equal 200 + end + + it "returns not found for movie with invalid id" do + get movie_path(-1), as: :json + + code = JSON.parse(response.code) + + must_respond_with :not_found + expect(code).must_equal 404 + end + end + + describe "create" do + let(:movie_data) { + { + title: "Crazy Rich Asians", + overview: "Rom Com in Singapore", + release_date: "2018-08-15", + inventory: 1 + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: movie_data + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find_by(id: body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "cannot create a new movie given invalid data" do + movie_data["title"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end + end end From 0991bc56f38855a15ef99ba690c42750b917cc0c Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Tue, 6 Nov 2018 12:56:37 -0800 Subject: [PATCH 14/40] Created check in column for rental --- db/migrate/20181106205541_add_check_in_date_to_rental.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181106205541_add_check_in_date_to_rental.rb diff --git a/db/migrate/20181106205541_add_check_in_date_to_rental.rb b/db/migrate/20181106205541_add_check_in_date_to_rental.rb new file mode 100644 index 000000000..4a1e60a68 --- /dev/null +++ b/db/migrate/20181106205541_add_check_in_date_to_rental.rb @@ -0,0 +1,5 @@ +class AddCheckInDateToRental < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checkin_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 67ee63f09..eea0d207f 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_06_015850) do +ActiveRecord::Schema.define(version: 2018_11_06_205541) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,7 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" + t.date "checkin_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From b2b562154fdbbd7bddf594674f5c934c2f36dc0d Mon Sep 17 00:00:00 2001 From: Hannah Date: Tue, 6 Nov 2018 14:41:23 -0800 Subject: [PATCH 15/40] checkin and checkout tests written in tdd format along with model tests for overdue items and available_inventory --- app/controllers/movies_controller.rb | 24 +++++++ app/views/rentals/checkout.json.rabl | 11 +++ app/views/rentals/errors.json.rabl | 5 ++ config/routes.rb | 4 +- test/controllers/movies_controller_test.rb | 84 +++++++++++++++++++++- test/fixtures/customers.yml | 26 +++---- test/fixtures/movies.yml | 16 +++-- test/fixtures/rentals.yml | 17 +++-- test/models/customer_test.rb | 12 +++- test/models/movie_test.rb | 12 +++- 10 files changed, 183 insertions(+), 28 deletions(-) create mode 100644 app/views/rentals/checkout.json.rabl create mode 100644 app/views/rentals/errors.json.rabl diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 77dc63b0d..c862ca96c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -24,6 +24,30 @@ def create end + def check_out + @movie = Movie.find_by(id: params[:movie_id]) + if @movie.nil? + return render "movies/notfound.json", status: :not_found + end + @customer = Customer.find_by(id: params[:customer_id]) + if @customer.nil? + return render "movies/notfound.json", status: :not_found + end + if @movie.available? == true && @customer.overdue? == false + @rental = Rental.new(customer: @customer, movie: @movie, + checkout_date: Date.current, due_date: Date.current + 7) + + if @rental.save + render "movies/checkout.json", status: :ok + else + render "rentals/errors.json", status: :bad_request + end + end + end + + def check_in + end + private def movie_params diff --git a/app/views/rentals/checkout.json.rabl b/app/views/rentals/checkout.json.rabl new file mode 100644 index 000000000..631712037 --- /dev/null +++ b/app/views/rentals/checkout.json.rabl @@ -0,0 +1,11 @@ +object @rental + +attributes :checkout_date, :due_date + +child :movie do + attributes :title +end + +child :customer do + attributes :name +end diff --git a/app/views/rentals/errors.json.rabl b/app/views/rentals/errors.json.rabl new file mode 100644 index 000000000..5d51decfc --- /dev/null +++ b/app/views/rentals/errors.json.rabl @@ -0,0 +1,5 @@ +object @rental + +node(:errors) { |rental| + rental.errors.messages +} diff --git a/config/routes.rb b/config/routes.rb index 43af050a0..52b25ffd0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,6 @@ resources :movies, only: [:index, :show, :create] # get "/zomg", to: "" - # post '/rentals/check-out', to: 'movies#checkout', as: 'checkout' - # post '/rentals/check-in', to: 'movies#checkin', as: 'checkin' + post '/rentals/check_out', to: 'movies#check_out', as: 'check_out' + post '/rentals/check_in', to: 'movies#check_in', as: 'check_in' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 587c3d64c..9536d2f44 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,11 @@ require "test_helper" describe MoviesController do - let(:movie) {movies(:movietwo)} + let(:movie) { movies(:movieone) } + let(:customer) { customers(:customerone) } + let(:rental) { rentals(:rentalone) } + let(:customertwo) { customers(:customertwo) } + describe "index" do it "is a real working route and returns JSON" do get movies_path, as: :json @@ -111,4 +115,82 @@ must_respond_with :bad_request end end + + describe "check_out" do + it "can successfully check out a movie" do + starting_inventory = movie.available_inventory + + expect { + post check_out_path, params: {customer: customer, movie: movie} + }.must_change "Rental.count", 1 + + movie = Movie.find_by(id: movie.id) + expect(movie.available_inventory).must_equal starting_inventory - 1 + + end + + it "does not check out a movie if there is not enough inventory" do + movie.available_inventory = 0 + + expect { + post check_out_path, params: {customer: customer, movie: movie} + }.wont_change "Rental.count", 1 + end + + it "does not check out a movie if customer has overdue items" do + expect { + post check_out_path, params: {customer: customertwo, movie: movie} + }.wont_change "Rental.count", 1 + end + + it "does not check out a movie if rental information is invalid " do + starting_inventory = movie.available_inventory + + expect { + post check_out_path, params: {movie: movie} + }.wont_change "Rental.count", 1 + + movie = Movie.find_by(id: movie.id) + expect(movie.available_inventory).must_equal starting_inventory + + end + end + + describe "check_in" do + it "successfully checks in a movie" do + starting_inventory = movie.available_inventory + + expect { + post check_in_path, params: {customer: customer, movie: movie} + }.wont_change "Rental.count" + + movie = Movie.find_by(id: movie.id) + rental = Rental.find_by(id: rental.id) + expect(movie.available_inventory).must_equal starting_inventory + 1 + expect(rental.checkin_date).wont_be_nil + + end + + it "does not check in a movie if parameters are invalid" do + starting_inventory = movie.available_inventory + + expect { + post check_in_path, params: {customer: "jane", movie: movie} + }.wont_change "Rental.count" + + movie = Movie.find_by(id: movie.id) + expect(movie.available_inventory).must_equal starting_inventory + end + + it "does not check in if parameters are missing" do + starting_inventory = movie.available_inventory + + expect { + post check_in_path, params: {movie: movie} + }.wont_change "Rental.count" + + movie = Movie.find_by(id: movie.id) + expect(movie.available_inventory).must_equal starting_inventory + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 7f48a2fbb..70d0c494c 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,21 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html customerone: - name: MyString + name: Tina registered_at: 2018-11-05 12:37:55 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 12 Elm St + city: Los Angeles + state: CA + postal_code: 91007 + phone: (206)124-2343 + movies_checked_out_count: 1 customertwo: - name: MyString + name: Juanita registered_at: 2018-11-05 12:37:55 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 2 Bernard Ave + city: Rochester + state: NY + postal_code: 14616 + phone: (585)845-2387 + movies_checked_out_count: 1 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index be36cf514..e2e1c4843 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html movieone: - title: MyString - overview: MyString - release_date: 2018-11-05 - inventory: 1 + title: Titanic + overview: Epic Romance + release_date: 2010-11-05 + inventory: 10 + available_inventory: 10 movietwo: - title: MyString - overview: MyString - release_date: 2018-11-05 + title: Casper + overview: The friendliest ghost you know. + release_date: 1997-08-05 inventory: 1 + available_inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index ccaa4258b..21183cdae 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html rentalone: - checkout_date: 2018-11-05 - due_date: 2018-11-05 + checkout_date: 2018-11-04 + due_date: 2018-11-10 movie: movieone customer: customerone + checkin_date: nil rentaltwo: - checkout_date: 2018-11-05 - due_date: 2018-11-05 + checkout_date: 2018-10-05 + due_date: 2018-10-12 movie: movietwo customer: customertwo + checkin_date: 2018-10-07 + +rentalthree: + checkout_date: 2018-10-05 + due_date: 2018-10-12 + movie: movietwo + customer: customertwo + checkin_date: nil diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 3fe56bb7f..c3556dcd5 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,6 +4,7 @@ describe Customer do let(:customer) { customers(:customerone) } + let(:customertwo) { customers(:customertwo) } describe "Validations" do it "is valid when all fields are present" do @@ -72,6 +73,15 @@ end end - describe "Custom Models" do + describe "Custom Methods" do + describe "overdue_items?" do + it "returns true if customer has overdue items" do + expect(customertwo.overdue_items).must_equal true + end + + it "returns false if customer has no overdue items" do + expect(customer.overdue_items).must_equal false + end + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 7549e1cc6..2619f2936 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -55,6 +55,16 @@ end end - describe "Custom Models" do + describe "Custom Methods" do + describe "available?" do + it "returns true if available inventory is greater than 0" do + expect(movie.available?).must_equal true + end + + it "returns false if available inventory is 0" do + movie.available_inventory = 0 + expect(movie.available?).must_equal false + end + end end end From e0d6a9ce73c89e718c7c5edb65db71aab818e692 Mon Sep 17 00:00:00 2001 From: Hannah Date: Tue, 6 Nov 2018 15:45:13 -0800 Subject: [PATCH 16/40] added controller tests for checked out --- app/controllers/movies_controller.rb | 27 ++++++++----- app/models/customer.rb | 11 +++++ app/models/movie.rb | 8 ++++ app/views/rentals/denied.json.rabl | 2 + test/controllers/movies_controller_test.rb | 47 ++++++++++++++++++---- test/models/customer_test.rb | 4 +- 6 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 app/views/rentals/denied.json.rabl diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c862ca96c..3818e726b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -26,22 +26,31 @@ def create def check_out @movie = Movie.find_by(id: params[:movie_id]) - if @movie.nil? - return render "movies/notfound.json", status: :not_found - end + if @movie.nil? + return render "movies/notfound.json", status: :not_found + end + @customer = Customer.find_by(id: params[:customer_id]) - if @customer.nil? - return render "movies/notfound.json", status: :not_found - end - if @movie.available? == true && @customer.overdue? == false + if @customer.nil? + return render "movies/notfound.json", status: :not_found + end + + if @movie.available? == true && @customer.overdue_items? == false @rental = Rental.new(customer: @customer, movie: @movie, checkout_date: Date.current, due_date: Date.current + 7) - if @rental.save - render "movies/checkout.json", status: :ok + if @rental.save + @movie.available_inventory -= 1 + @movie.save + @customer.movies_checked_out_count += 1 + @customer.save + + render "rentals/checkout.json", status: :ok else render "rentals/errors.json", status: :bad_request end + else + render "rentals/denied.json", status: :forbidden end end diff --git a/app/models/customer.rb b/app/models/customer.rb index c0136d68f..e8cd106a5 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -9,4 +9,15 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true + + def overdue_items? + overdue = self.rentals.select{ |rental| rental.checkin_date == nil && + rental.due_date < Date.current } + + if overdue.empty? + return false + else + return true + end + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 0533a1b45..5275530d5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,4 +6,12 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true + + def available? + if self.available_inventory > 0 + return true + else + return false + end + end end diff --git a/app/views/rentals/denied.json.rabl b/app/views/rentals/denied.json.rabl new file mode 100644 index 000000000..e208b9e6d --- /dev/null +++ b/app/views/rentals/denied.json.rabl @@ -0,0 +1,2 @@ +node(:ok) { false } +node(:message) { "forbidden: not enough movie inventory or customer has overdue items" } diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 9536d2f44..71b021f2c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -118,46 +118,75 @@ describe "check_out" do it "can successfully check out a movie" do + movie = movies(:movieone) starting_inventory = movie.available_inventory expect { - post check_out_path, params: {customer: customer, movie: movie} + post check_out_path, params: {customer_id: customer.id, movie_id: movie.id} }.must_change "Rental.count", 1 + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "checkout_date" + movie = Movie.find_by(id: movie.id) - expect(movie.available_inventory).must_equal starting_inventory - 1 + expect(movie.available_inventory).must_equal (starting_inventory - 1) end it "does not check out a movie if there is not enough inventory" do movie.available_inventory = 0 + movie.save expect { - post check_out_path, params: {customer: customer, movie: movie} - }.wont_change "Rental.count", 1 + post check_out_path, params: {customer_id: customer.id, movie_id: movie.id} + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "forbidden" + must_respond_with :forbidden end it "does not check out a movie if customer has overdue items" do expect { - post check_out_path, params: {customer: customertwo, movie: movie} - }.wont_change "Rental.count", 1 + post check_out_path, params: {customer_id: customertwo.id, movie_id: movie.id} + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "forbidden" + must_respond_with :forbidden end it "does not check out a movie if rental information is invalid " do + movie = movies(:movieone) starting_inventory = movie.available_inventory expect { - post check_out_path, params: {movie: movie} - }.wont_change "Rental.count", 1 + post check_out_path, params: {movie_id: movie.id} + }.wont_change "Rental.count" movie = Movie.find_by(id: movie.id) expect(movie.available_inventory).must_equal starting_inventory + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "not found" + must_respond_with :not_found end end describe "check_in" do it "successfully checks in a movie" do + movie = movies(:movieone) + rental = rentals(:rentalone) starting_inventory = movie.available_inventory expect { @@ -172,6 +201,7 @@ end it "does not check in a movie if parameters are invalid" do + movie = movies(:movieone) starting_inventory = movie.available_inventory expect { @@ -183,6 +213,7 @@ end it "does not check in if parameters are missing" do + movie = movies(:movieone) starting_inventory = movie.available_inventory expect { diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index c3556dcd5..0b40561c9 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -76,11 +76,11 @@ describe "Custom Methods" do describe "overdue_items?" do it "returns true if customer has overdue items" do - expect(customertwo.overdue_items).must_equal true + expect(customertwo.overdue_items?).must_equal true end it "returns false if customer has no overdue items" do - expect(customer.overdue_items).must_equal false + expect(customer.overdue_items?).must_equal false end end end From 1d998a2f4c300443b5af26d7317e6b853cb5d9ae Mon Sep 17 00:00:00 2001 From: Hannah Date: Tue, 6 Nov 2018 15:58:18 -0800 Subject: [PATCH 17/40] completed controller for checkin --- app/controllers/movies_controller.rb | 23 +++++++++++++++++++++ app/views/rentals/checkout.json.rabl | 2 +- test/controllers/movies_controller_test.rb | 24 +++++++++++++++++++--- 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3818e726b..d2ac9ed4a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -55,6 +55,29 @@ def check_out end def check_in + @movie = Movie.find_by(id: params[:movie_id]) + if @movie.nil? + return render "movies/notfound.json", status: :not_found + end + + @customer = Customer.find_by(id: params[:customer_id]) + if @customer.nil? + return render "movies/notfound.json", status: :not_found + end + + @rental = Rental.where(customer_id: @customer.id, movie_id: @movie.id).order(checkout_date: :asc).first + if @rental.nil? + return render "movies/notfound.json", status: :not_found + else + @rental.checkin_date = DateTime.current + @rental.save + @movie.available_inventory += 1 + @movie.save + + render "rentals/checkout.json", status: :ok + end + + end private diff --git a/app/views/rentals/checkout.json.rabl b/app/views/rentals/checkout.json.rabl index 631712037..31b58a991 100644 --- a/app/views/rentals/checkout.json.rabl +++ b/app/views/rentals/checkout.json.rabl @@ -1,6 +1,6 @@ object @rental -attributes :checkout_date, :due_date +attributes :checkout_date, :due_date, :checkin_date child :movie do attributes :title diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 71b021f2c..4e0d99027 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -190,9 +190,13 @@ starting_inventory = movie.available_inventory expect { - post check_in_path, params: {customer: customer, movie: movie} + post check_in_path, params: {customer_id: customer.id, movie_id: movie.id} }.wont_change "Rental.count" + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "checkout_date" + movie = Movie.find_by(id: movie.id) rental = Rental.find_by(id: rental.id) expect(movie.available_inventory).must_equal starting_inventory + 1 @@ -205,9 +209,16 @@ starting_inventory = movie.available_inventory expect { - post check_in_path, params: {customer: "jane", movie: movie} + post check_in_path, params: {customer_id: -1, movie_id: movie.id} }.wont_change "Rental.count" + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "not found" + must_respond_with :not_found + movie = Movie.find_by(id: movie.id) expect(movie.available_inventory).must_equal starting_inventory end @@ -217,9 +228,16 @@ starting_inventory = movie.available_inventory expect { - post check_in_path, params: {movie: movie} + post check_in_path, params: {movie_id: movie.id} }.wont_change "Rental.count" + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "not found" + must_respond_with :not_found + movie = Movie.find_by(id: movie.id) expect(movie.available_inventory).must_equal starting_inventory end From cdd69e234defc0527f9f8ed9a441f02238ef2f0d Mon Sep 17 00:00:00 2001 From: Hannah Date: Tue, 6 Nov 2018 16:12:28 -0800 Subject: [PATCH 18/40] smoke tests now passing when routes changed to check-in/checkout and method names checkin checkout --- app/controllers/movies_controller.rb | 6 ++++-- app/views/rentals/checkout.json.rabl | 2 +- config/routes.rb | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d2ac9ed4a..94de0b89e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -24,7 +24,7 @@ def create end - def check_out + def checkout @movie = Movie.find_by(id: params[:movie_id]) if @movie.nil? return render "movies/notfound.json", status: :not_found @@ -54,7 +54,7 @@ def check_out end end - def check_in + def checkin @movie = Movie.find_by(id: params[:movie_id]) if @movie.nil? return render "movies/notfound.json", status: :not_found @@ -73,6 +73,8 @@ def check_in @rental.save @movie.available_inventory += 1 @movie.save + @customer.movies_checked_out_count -= 1 + @customer.save render "rentals/checkout.json", status: :ok end diff --git a/app/views/rentals/checkout.json.rabl b/app/views/rentals/checkout.json.rabl index 31b58a991..347ac5fe7 100644 --- a/app/views/rentals/checkout.json.rabl +++ b/app/views/rentals/checkout.json.rabl @@ -7,5 +7,5 @@ child :movie do end child :customer do - attributes :name + attributes :name, :movies_checked_out_count end diff --git a/config/routes.rb b/config/routes.rb index 52b25ffd0..0adb140de 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,6 @@ resources :movies, only: [:index, :show, :create] # get "/zomg", to: "" - post '/rentals/check_out', to: 'movies#check_out', as: 'check_out' - post '/rentals/check_in', to: 'movies#check_in', as: 'check_in' + post '/rentals/check-out', to: 'movies#checkout', as: 'check_out' + post '/rentals/check-in', to: 'movies#checkin', as: 'check_in' end From acb06c17a3db3ad82337806b69c73c88799e7120 Mon Sep 17 00:00:00 2001 From: Hannah Date: Tue, 6 Nov 2018 16:26:39 -0800 Subject: [PATCH 19/40] changed notfound into layouts for json.rabl --- app/controllers/movies_controller.rb | 12 ++++++------ app/views/{movies => layouts}/notfound.json.rabl | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename app/views/{movies => layouts}/notfound.json.rabl (100%) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 94de0b89e..5f33b60c1 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,7 @@ def show @movie = Movie.find_by(id: params[:id]) if @movie.nil? - render "movies/notfound.json", status: :not_found + render "layouts/notfound.json", status: :not_found else render "movies/show.json", status: :ok end @@ -27,12 +27,12 @@ def create def checkout @movie = Movie.find_by(id: params[:movie_id]) if @movie.nil? - return render "movies/notfound.json", status: :not_found + return render "layouts/notfound.json", status: :not_found end @customer = Customer.find_by(id: params[:customer_id]) if @customer.nil? - return render "movies/notfound.json", status: :not_found + return render "layouts/notfound.json", status: :not_found end if @movie.available? == true && @customer.overdue_items? == false @@ -57,17 +57,17 @@ def checkout def checkin @movie = Movie.find_by(id: params[:movie_id]) if @movie.nil? - return render "movies/notfound.json", status: :not_found + return render "layouts/notfound.json", status: :not_found end @customer = Customer.find_by(id: params[:customer_id]) if @customer.nil? - return render "movies/notfound.json", status: :not_found + return render "layouts/notfound.json", status: :not_found end @rental = Rental.where(customer_id: @customer.id, movie_id: @movie.id).order(checkout_date: :asc).first if @rental.nil? - return render "movies/notfound.json", status: :not_found + return render "layouts/notfound.json", status: :not_found else @rental.checkin_date = DateTime.current @rental.save diff --git a/app/views/movies/notfound.json.rabl b/app/views/layouts/notfound.json.rabl similarity index 100% rename from app/views/movies/notfound.json.rabl rename to app/views/layouts/notfound.json.rabl From 8cc9e2821b63d328fc91f25e20d3618bd4c5a980 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Wed, 7 Nov 2018 09:48:32 -0800 Subject: [PATCH 20/40] Reconfigured controller based on Postman output --- app/controllers/movies_controller.rb | 2 +- app/views/movies/notfound.json.rabl | 2 ++ app/views/rentals/checkout.json.rabl | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 app/views/movies/notfound.json.rabl diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5f33b60c1..ba316965b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -70,11 +70,11 @@ def checkin return render "layouts/notfound.json", status: :not_found else @rental.checkin_date = DateTime.current - @rental.save @movie.available_inventory += 1 @movie.save @customer.movies_checked_out_count -= 1 @customer.save + @rental.save render "rentals/checkout.json", status: :ok end diff --git a/app/views/movies/notfound.json.rabl b/app/views/movies/notfound.json.rabl new file mode 100644 index 000000000..0394b286c --- /dev/null +++ b/app/views/movies/notfound.json.rabl @@ -0,0 +1,2 @@ +node(:ok) { false } +node(:message) { "not found" } diff --git a/app/views/rentals/checkout.json.rabl b/app/views/rentals/checkout.json.rabl index 347ac5fe7..a159f50f1 100644 --- a/app/views/rentals/checkout.json.rabl +++ b/app/views/rentals/checkout.json.rabl @@ -3,7 +3,7 @@ object @rental attributes :checkout_date, :due_date, :checkin_date child :movie do - attributes :title + attributes :title, :available_inventory end child :customer do From 756f999d28d6bb52d15a78d0fc5ce53193bb656b Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Wed, 7 Nov 2018 10:12:16 -0800 Subject: [PATCH 21/40] Refactored check-in and check-out to rentals controller --- app/controllers/rentals_controller.rb | 56 ++++++++ app/models/rental.rb | 23 ++- app/views/rentals/denied.json.rabl | 2 - app/views/rentals/denied_customer.json.rabl | 2 + app/views/rentals/denied_movie.json.rabl | 2 + ...eckout.json.rabl => transaction.json.rabl} | 0 config/routes.rb | 4 +- test/controllers/rentals_controller_test.rb | 135 ++++++++++++++++++ 8 files changed, 219 insertions(+), 5 deletions(-) create mode 100644 app/controllers/rentals_controller.rb delete mode 100644 app/views/rentals/denied.json.rabl create mode 100644 app/views/rentals/denied_customer.json.rabl create mode 100644 app/views/rentals/denied_movie.json.rabl rename app/views/rentals/{checkout.json.rabl => transaction.json.rabl} (100%) create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..64ff0fe1b --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,56 @@ +class RentalsController < ApplicationController + before_action :find_movie + before_action :find_customer + + def checkout + if @movie.available? && !@customer.overdue_items? + + @rental = Rental.create_rental(@customer, @movie) + + if @rental.save + @rental.check_out_transaction(@customer, @movie) + render "rentals/transaction.json", status: :ok + else + render "rentals/errors.json", status: :bad_request + end + + elsif !@movie.available? + render "rentals/denied_movie.json", status: :forbidden + else + render "rentals/denied_customer.json", status: :forbidden + end + end + + def checkin + @rental = Rental.where(customer_id: @customer.id, movie_id: @movie.id).order(checkout_date: :asc).first + + if @rental.nil? + return render "layouts/notfound.json", status: :not_found + else + @rental.check_in_transaction(@customer, @movie) + render "rentals/transaction.json", status: :ok + end + end + + private + + def rental_params + params.permit(:movie_id, :customer_id) + end + + def find_movie + @movie = Movie.find_by(id: params[:movie_id]) + + if @movie.nil? + return render "layouts/notfound.json", status: :not_found + end + end + + def find_customer + @customer = Customer.find_by(id: params[:customer_id]) + + if @customer.nil? + return render "layouts/notfound.json", status: :not_found + end + end +end diff --git a/app/models/rental.rb b/app/models/rental.rb index dece82f83..b411bec45 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,5 +3,26 @@ class Rental < ApplicationRecord belongs_to :movie validates :checkout_date, presence: true - validates :due_date, presence: true + validates :due_date, presence: true + + def self.create_rental(customer, movie) + return Rental.new(customer: customer, movie: movie, + checkout_date: Date.current, due_date: Date.current + 7) + end + + def check_out_transaction(customer, movie) + movie.available_inventory -= 1 + movie.save + customer.movies_checked_out_count += 1 + customer.save + end + + def check_in_transaction(customer, movie) + self.checkin_date = DateTime.current + movie.available_inventory += 1 + movie.save + customer.movies_checked_out_count -= 1 + customer.save + self.save + end end diff --git a/app/views/rentals/denied.json.rabl b/app/views/rentals/denied.json.rabl deleted file mode 100644 index e208b9e6d..000000000 --- a/app/views/rentals/denied.json.rabl +++ /dev/null @@ -1,2 +0,0 @@ -node(:ok) { false } -node(:message) { "forbidden: not enough movie inventory or customer has overdue items" } diff --git a/app/views/rentals/denied_customer.json.rabl b/app/views/rentals/denied_customer.json.rabl new file mode 100644 index 000000000..704f787d6 --- /dev/null +++ b/app/views/rentals/denied_customer.json.rabl @@ -0,0 +1,2 @@ +node(:ok) { false } +node(:message) { "forbidden: customer has overdue items" } diff --git a/app/views/rentals/denied_movie.json.rabl b/app/views/rentals/denied_movie.json.rabl new file mode 100644 index 000000000..2bd8127a0 --- /dev/null +++ b/app/views/rentals/denied_movie.json.rabl @@ -0,0 +1,2 @@ +node(:ok) { false } +node(:message) { "forbidden: not enough movie inventory" } diff --git a/app/views/rentals/checkout.json.rabl b/app/views/rentals/transaction.json.rabl similarity index 100% rename from app/views/rentals/checkout.json.rabl rename to app/views/rentals/transaction.json.rabl diff --git a/config/routes.rb b/config/routes.rb index 0adb140de..97169ef66 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,6 @@ resources :movies, only: [:index, :show, :create] # get "/zomg", to: "" - post '/rentals/check-out', to: 'movies#checkout', as: 'check_out' - post '/rentals/check-in', to: 'movies#checkin', as: 'check_in' + post '/rentals/check-out', to: 'rentals#checkout', as: 'check_out' + post '/rentals/check-in', to: 'rentals#checkin', as: 'check_in' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..d38e4fb88 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,135 @@ +require "test_helper" + +describe RentalsController do + let(:movie) { movies(:movieone) } + let(:customer) { customers(:customerone) } + let(:rental) { rentals(:rentalone) } + let(:customertwo) { customers(:customertwo) } + + describe "check_out" do + it "can successfully check out a movie" do + movie = movies(:movieone) + starting_inventory = movie.available_inventory + + expect { + post check_out_path, params: {customer_id: customer.id, movie_id: movie.id} + }.must_change "Rental.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "checkout_date" + + movie = Movie.find_by(id: movie.id) + expect(movie.available_inventory).must_equal (starting_inventory - 1) + + end + + it "does not check out a movie if there is not enough inventory" do + movie.available_inventory = 0 + movie.save + + expect { + post check_out_path, params: {customer_id: customer.id, movie_id: movie.id} + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "forbidden" + must_respond_with :forbidden + end + + it "does not check out a movie if customer has overdue items" do + expect { + post check_out_path, params: {customer_id: customertwo.id, movie_id: movie.id} + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "forbidden" + must_respond_with :forbidden + end + + it "does not check out a movie if rental information is invalid " do + movie = movies(:movieone) + starting_inventory = movie.available_inventory + + expect { + post check_out_path, params: {movie_id: movie.id} + }.wont_change "Rental.count" + + movie = Movie.find_by(id: movie.id) + expect(movie.available_inventory).must_equal starting_inventory + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "not found" + must_respond_with :not_found + end + end + + describe "check_in" do + it "successfully checks in a movie" do + movie = movies(:movieone) + rental = rentals(:rentalone) + starting_inventory = movie.available_inventory + + expect { + post check_in_path, params: {customer_id: customer.id, movie_id: movie.id} + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "checkout_date" + + movie = Movie.find_by(id: movie.id) + rental = Rental.find_by(id: rental.id) + expect(movie.available_inventory).must_equal starting_inventory + 1 + expect(rental.checkin_date).wont_be_nil + + end + + it "does not check in a movie if parameters are invalid" do + movie = movies(:movieone) + starting_inventory = movie.available_inventory + + expect { + post check_in_path, params: {customer_id: -1, movie_id: movie.id} + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "not found" + must_respond_with :not_found + + movie = Movie.find_by(id: movie.id) + expect(movie.available_inventory).must_equal starting_inventory + end + + it "does not check in if parameters are missing" do + movie = movies(:movieone) + starting_inventory = movie.available_inventory + + expect { + post check_in_path, params: {movie_id: movie.id} + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "not found" + must_respond_with :not_found + + movie = Movie.find_by(id: movie.id) + expect(movie.available_inventory).must_equal starting_inventory + end + end +end From ddf64e5413e3e79207323ab0d14be495fcce5da0 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 7 Nov 2018 11:11:25 -0800 Subject: [PATCH 22/40] queries added to customer index --- Gemfile | 1 + Gemfile.lock | 2 ++ app/controllers/customers_controller.rb | 30 ++++++++++++++++++++++++- app/views/layouts/badrequest.json.rabl | 2 ++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 app/views/layouts/badrequest.json.rabl diff --git a/Gemfile b/Gemfile index 941be17d7..b292d644c 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,7 @@ gem 'pg', '>= 0.18', '< 2.0' gem 'puma', '~> 3.11' gem 'rabl', '~> 0.14.0' gem 'oj' +gem 'will_paginate' # 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 diff --git a/Gemfile.lock b/Gemfile.lock index e29140447..8e38561f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,6 +147,7 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) + will_paginate (3.1.6) PLATFORMS ruby @@ -166,6 +167,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) tzinfo-data + will_paginate RUBY VERSION ruby 2.5.1p57 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 4ce2f7742..c5e925410 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,27 @@ class CustomersController < ApplicationController def index - @customers = Customer.all + @customers = Customer.all.order(:id) + sort_options = ["name", "registered_at", "postal_code"] + if params[:sort] + if sort_options.include? params[:sort] + @customers = Customer.all.order(params[:sort]) + else + return render "layouts/badrequest.json", status_code: :bad_request + end + end + + if params[:n] + return render "layouts/badrequest.json" if !integer?(params[:n].to_i) + end + + if params[:p] + return render "layouts/badrequest.json" if !integer?(params[:p].to_i) + end + + if params[:n] && params[:p] + @customers = @customers.paginate(:page => params[:p], :per_page => params[:n]) + end end private @@ -10,4 +30,12 @@ def customer_params params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone) end + + def integer?(x) + if x.integer? && x > 0 + return true + else + return false + end + end end diff --git a/app/views/layouts/badrequest.json.rabl b/app/views/layouts/badrequest.json.rabl new file mode 100644 index 000000000..f4829acc0 --- /dev/null +++ b/app/views/layouts/badrequest.json.rabl @@ -0,0 +1,2 @@ +node(:ok) { false } +node(:message) { "bad request" } From 7571e70943a00611a15e2feff616d689f0325a44 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 7 Nov 2018 11:15:01 -0800 Subject: [PATCH 23/40] queries added for movies index --- app/controllers/movies_controller.rb | 30 +++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ba316965b..2ab65360a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,27 @@ class MoviesController < ApplicationController def index - @movies = Movie.all + @movies = Movie.all.order(:id) + sort_options = ["title", "release_date"] + if params[:sort] + if sort_options.include? params[:sort] + @movies = Movie.all.order(params[:sort]) + else + return render "layouts/badrequest.json", status_code: :bad_request + end + end + + if params[:n] + return render "layouts/badrequest.json" if !integer?(params[:n].to_i) + end + + if params[:p] + return render "layouts/badrequest.json" if !integer?(params[:p].to_i) + end + + if params[:n] && params[:p] + @movies = @movies.paginate(:page => params[:p], :per_page => params[:n]) + end end def show @@ -88,4 +108,12 @@ def movie_params params.permit(:title, :overview, :release_date, :inventory) end + def integer?(x) + if x.integer? && x > 0 + return true + else + return false + end + end + end From 73b471ca2d76debd82a07daa3f75fc80fd4e3741 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Wed, 7 Nov 2018 11:31:00 -0800 Subject: [PATCH 24/40] Wrote custom method tests for rental model after refactoring code --- app/controllers/rentals_controller.rb | 2 +- test/models/rental_test.rb | 31 ++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 64ff0fe1b..d9f66348a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -22,7 +22,7 @@ def checkout end def checkin - @rental = Rental.where(customer_id: @customer.id, movie_id: @movie.id).order(checkout_date: :asc).first + @rental = Rental.where(customer_id: @customer.id, movie_id: @movie.id).where(checkin_date: nil).order(checkout_date: :asc).first if @rental.nil? return render "layouts/notfound.json", status: :not_found diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 30f4ba03d..dec47aa26 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -78,7 +78,36 @@ expect(rental.movie).must_equal movietwo end end + let(:rental) { rentals(:rentalone) } + let(:customertwo) { customers(:customertwo) } + let(:movietwo) { movies(:movietwo) } + + describe "Custom Methods" do + describe "check_out_transaction" do + it "checks out a rental successfully" do + num_checked_out = customertwo.movies_checked_out_count + avail_inventory = movietwo.available_inventory + + rental = Rental.new(customer_id: customertwo.id, movie_id: movietwo.id, checkout_date: Date.current, due_date: Date.current + 7) + + rental.check_out_transaction(customertwo, movietwo) - describe "Custom Models" do + expect(customertwo.movies_checked_out_count).must_equal num_checked_out + 1 + expect(movietwo.available_inventory).must_equal avail_inventory - 1 + end + end + + describe "check_in_transaction" do + it "checks in a rental successfully" do + num_checked_out = customertwo.movies_checked_out_count + avail_inventory = movietwo.available_inventory + + rental.check_in_transaction(customertwo, movietwo) + + expect(rental.checkin_date).wont_be_nil + expect(customertwo.movies_checked_out_count).must_equal num_checked_out - 1 + expect(movietwo.available_inventory).must_equal avail_inventory + 1 + end + end end end From 3699929fe430d2e91566a100e63ca9cdfc1bbd35 Mon Sep 17 00:00:00 2001 From: Hannah Date: Wed, 7 Nov 2018 13:51:25 -0800 Subject: [PATCH 25/40] customer query tests written and passing --- app/controllers/customers_controller.rb | 12 +++-- test/controllers/customers_controller_test.rb | 46 +++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c5e925410..dab61666b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -7,16 +7,16 @@ def index if sort_options.include? params[:sort] @customers = Customer.all.order(params[:sort]) else - return render "layouts/badrequest.json", status_code: :bad_request + return render "layouts/badrequest.json", status: :bad_request end end if params[:n] - return render "layouts/badrequest.json" if !integer?(params[:n].to_i) + return render "layouts/badrequest.json", status: :bad_request if !integer?(params[:n]) end if params[:p] - return render "layouts/badrequest.json" if !integer?(params[:p].to_i) + return render "layouts/badrequest.json", status: :bad_request if !integer?(params[:p]) end if params[:n] && params[:p] @@ -28,11 +28,13 @@ def index def customer_params params.require(:customer).permit(:name, :registered_at, :address, :city, - :state, :postal_code, :phone) + :state, :postal_code, :phone, :sort, :p, :n) end def integer?(x) - if x.integer? && x > 0 + if x != x.to_i.to_s + return false + elsif x.to_i.integer? && x.to_i > 0 return true else return false diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 9afc9cd7a..2fa1bdde6 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -38,5 +38,51 @@ expect(customer.keys.length).must_equal fields.length end end + + it "successfully returns sorted array given a valid query parameter" do + get customers_path, params: {format: "json", sort: "name"} + body = JSON.parse(response.body) + + expect(body[0]["name"]).must_be :<, body[-1]["name"] + must_respond_with :success + end + + it "renders badrequest json if given an invalid sort query parameter" do + get customers_path, params: {format: "json", sort: "pina"} + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "bad request" + must_respond_with :bad_request + end + + it "paginates accurately given valid query parameters" do + get customers_path, params: {format: "json", n: 10, p: 1 } + body = JSON.parse(response.body) + + expect(body.length).must_equal 2 + must_respond_with :success + end + + it "renders bad request given invalid paginate query parameters" do + get customers_path, params: {format: "json", n: 10, p: 1.5 } + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "bad request" + must_respond_with :bad_request + end + + it "sorts and paginates correctly given valid query parameters" do + get customers_path, params: {format: "json", sort: "name", n: 10, p: 1 } + body = JSON.parse(response.body) + + expect(body.length).must_equal 2 + expect(body[0]["name"]).must_be :<, body[-1]["name"] + must_respond_with :success + end end end From 3604f7ef41cef7efd4b2a93c8c60675da9f72319 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Wed, 7 Nov 2018 14:30:28 -0800 Subject: [PATCH 26/40] Completed tests for sorting and pagination for movies and customers --- app/controllers/application_controller.rb | 16 ++++++++ app/controllers/customers_controller.rb | 24 ++++------- app/controllers/movies_controller.rb | 15 ++----- test/controllers/movies_controller_test.rb | 47 ++++++++++++++++++++++ 4 files changed, 73 insertions(+), 29 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..48e11247c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,18 @@ class ApplicationController < ActionController::API + + private + + def bad_request + render "layouts/badrequest.json", status: :bad_request + end + + def integer?(x) + if x != x.to_i.to_s + return false + elsif x.to_i.integer? && x.to_i > 0 + return true + else + return false + end + end end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index dab61666b..d02e38b9e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,43 +1,33 @@ class CustomersController < ApplicationController def index - @customers = Customer.all.order(:id) sort_options = ["name", "registered_at", "postal_code"] + @customers = Customer.all.order(:id) + if params[:sort] if sort_options.include? params[:sort] @customers = Customer.all.order(params[:sort]) else - return render "layouts/badrequest.json", status: :bad_request + return bad_request end end if params[:n] - return render "layouts/badrequest.json", status: :bad_request if !integer?(params[:n]) + return bad_request if !integer?(params[:n]) end if params[:p] - return render "layouts/badrequest.json", status: :bad_request if !integer?(params[:p]) + return bad_request if !integer?(params[:p]) end if params[:n] && params[:p] - @customers = @customers.paginate(:page => params[:p], :per_page => params[:n]) + @customers = @customers.paginate(:page => params[:p], :per_page => params[:n]) end end private def customer_params - params.require(:customer).permit(:name, :registered_at, :address, :city, - :state, :postal_code, :phone, :sort, :p, :n) - end - - def integer?(x) - if x != x.to_i.to_s - return false - elsif x.to_i.integer? && x.to_i > 0 - return true - else - return false - end + params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :sort, :p, :n) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 2ab65360a..ac800438e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,16 +7,16 @@ def index if sort_options.include? params[:sort] @movies = Movie.all.order(params[:sort]) else - return render "layouts/badrequest.json", status_code: :bad_request + return bad_request end end if params[:n] - return render "layouts/badrequest.json" if !integer?(params[:n].to_i) + return bad_request if !integer?(params[:n]) end if params[:p] - return render "layouts/badrequest.json" if !integer?(params[:p].to_i) + return bad_request if !integer?(params[:p]) end if params[:n] && params[:p] @@ -107,13 +107,4 @@ def checkin def movie_params params.permit(:title, :overview, :release_date, :inventory) end - - def integer?(x) - if x.integer? && x > 0 - return true - else - return false - end - end - end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 4e0d99027..5cbed3306 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -42,6 +42,53 @@ expect(movie.keys.length).must_equal fields.length end end + + it "successfully returns sorted array given a valid query parameter" do + get movies_path, params: {format: "json", sort: "title"} + body = JSON.parse(response.body) + + expect(body[0]["title"]).must_be :<, body[-1]["title"] + must_respond_with :success + end + + it "renders badrequest json if given an invalid sort query parameter" do + get movies_path, params: {format: "json", sort: "pina"} + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "bad request" + must_respond_with :bad_request + end + + it "paginates accurately given valid query parameters" do + get movies_path, params: {format: "json", n: 10, p: 1 } + body = JSON.parse(response.body) + + expect(body.length).must_equal 2 + must_respond_with :success + end + + it "renders bad request given invalid paginate query parameters" do + get movies_path, params: {format: "json", n: 10, p: 1.5 } + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "bad request" + must_respond_with :bad_request + end + + it "sorts and paginates correctly given valid query parameters" do + get movies_path, params: {format: "json", sort: "title", n: 10, p: 1 } + body = JSON.parse(response.body) + + expect(body.length).must_equal 2 + expect(body[0]["title"]).must_be :<, body[-1]["title"] + must_respond_with :success + end + end describe "show" do From b6f36409c88aae58f8293717e12da5bd4efb9584 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Wed, 7 Nov 2018 19:05:18 -0800 Subject: [PATCH 27/40] Refactored sort and paginate --- app/controllers/application_controller.rb | 26 +++++++++++++++++++++++ app/controllers/customers_controller.rb | 23 ++------------------ app/controllers/movies_controller.rb | 22 ++----------------- 3 files changed, 30 insertions(+), 41 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 48e11247c..b2b8db75b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -15,4 +15,30 @@ def integer?(x) return false end end + + def sort_and_paginate(options, list, params) + if params[:sort] + if options.include? params[:sort] + list = list.all.order(params[:sort]) + else + return bad_request + end + else + list = list.all.order(:id) + end + + if params[:n] + return bad_request if !integer?(params[:n]) + end + + if params[:p] + return bad_request if !integer?(params[:p]) + end + + if params[:p] || params[:n] + list = list.paginate(:page => params[:p], :per_page => params[:n]) + end + + return list + end end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d02e38b9e..94536caa6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,27 +2,8 @@ class CustomersController < ApplicationController def index sort_options = ["name", "registered_at", "postal_code"] - @customers = Customer.all.order(:id) - - if params[:sort] - if sort_options.include? params[:sort] - @customers = Customer.all.order(params[:sort]) - else - return bad_request - end - end - - if params[:n] - return bad_request if !integer?(params[:n]) - end - - if params[:p] - return bad_request if !integer?(params[:p]) - end - - if params[:n] && params[:p] - @customers = @customers.paginate(:page => params[:p], :per_page => params[:n]) - end + list = Customer.all + @customers = sort_and_paginate(sort_options, list, params) end private diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ac800438e..0861fb268 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,27 +1,9 @@ class MoviesController < ApplicationController def index - @movies = Movie.all.order(:id) sort_options = ["title", "release_date"] - if params[:sort] - if sort_options.include? params[:sort] - @movies = Movie.all.order(params[:sort]) - else - return bad_request - end - end - - if params[:n] - return bad_request if !integer?(params[:n]) - end - - if params[:p] - return bad_request if !integer?(params[:p]) - end - - if params[:n] && params[:p] - @movies = @movies.paginate(:page => params[:p], :per_page => params[:n]) - end + list = Movie.all + @movies = sort_and_paginate(sort_options, list, params) end def show From 8e15a221126e88e1539146ee49faec1f2a21a55a Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Wed, 7 Nov 2018 19:18:08 -0800 Subject: [PATCH 28/40] Added zomg route with rendered json --- app/controllers/customers_controller.rb | 4 ++ app/controllers/movies_controller.rb | 61 +------------------ app/views/customers/zomg.json.rabl | 2 + config/routes.rb | 2 +- test/controllers/customers_controller_test.rb | 9 +++ 5 files changed, 17 insertions(+), 61 deletions(-) create mode 100644 app/views/customers/zomg.json.rabl diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 94536caa6..17a8801e6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -6,6 +6,10 @@ def index @customers = sort_and_paginate(sort_options, list, params) end + def zomg + render "customers/zomg.json.rabl", status: :ok + end + private def customer_params diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 0861fb268..e2e5dd268 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -23,70 +23,11 @@ def create else render "movies/errors.json", status: :bad_request end - - end - - def checkout - @movie = Movie.find_by(id: params[:movie_id]) - if @movie.nil? - return render "layouts/notfound.json", status: :not_found - end - - @customer = Customer.find_by(id: params[:customer_id]) - if @customer.nil? - return render "layouts/notfound.json", status: :not_found - end - - if @movie.available? == true && @customer.overdue_items? == false - @rental = Rental.new(customer: @customer, movie: @movie, - checkout_date: Date.current, due_date: Date.current + 7) - - if @rental.save - @movie.available_inventory -= 1 - @movie.save - @customer.movies_checked_out_count += 1 - @customer.save - - render "rentals/checkout.json", status: :ok - else - render "rentals/errors.json", status: :bad_request - end - else - render "rentals/denied.json", status: :forbidden - end - end - - def checkin - @movie = Movie.find_by(id: params[:movie_id]) - if @movie.nil? - return render "layouts/notfound.json", status: :not_found - end - - @customer = Customer.find_by(id: params[:customer_id]) - if @customer.nil? - return render "layouts/notfound.json", status: :not_found - end - - @rental = Rental.where(customer_id: @customer.id, movie_id: @movie.id).order(checkout_date: :asc).first - if @rental.nil? - return render "layouts/notfound.json", status: :not_found - else - @rental.checkin_date = DateTime.current - @movie.available_inventory += 1 - @movie.save - @customer.movies_checked_out_count -= 1 - @customer.save - @rental.save - - render "rentals/checkout.json", status: :ok - end - - end private def movie_params - params.permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory, :sort, :p, :n) end end diff --git a/app/views/customers/zomg.json.rabl b/app/views/customers/zomg.json.rabl new file mode 100644 index 000000000..7deb3b8e2 --- /dev/null +++ b/app/views/customers/zomg.json.rabl @@ -0,0 +1,2 @@ +node(:ok) { true } +node(:message) { "it works!" } diff --git a/config/routes.rb b/config/routes.rb index 97169ef66..d0342f44b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - # get "/zomg", to: "" + get "/zomg", to: "customers#zomg", as: 'zomg' post '/rentals/check-out', to: 'rentals#checkout', as: 'check_out' post '/rentals/check-in', to: 'rentals#checkin', as: 'check_in' end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2fa1bdde6..b9cf06c54 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -85,4 +85,13 @@ must_respond_with :success end end + + describe "zomg" do + it "works" do + get zomg_path, as: :json + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + end end From 4a4eb77672720a7e87b6bb57cf04ab785d14805f Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Wed, 7 Nov 2018 20:04:54 -0800 Subject: [PATCH 29/40] Added current and history endpoints, and refactored model relationships --- app/controllers/customers_controller.rb | 29 +++++++++++++++ app/controllers/movies_controller.rb | 37 ++++++++++++++++---- app/controllers/rentals_controller.rb | 4 +++ app/models/customer.rb | 1 - app/models/movie.rb | 1 - app/views/customers/currenthistory.json.rabl | 7 ++++ app/views/layouts/empty.json.rabl | 2 ++ app/views/movies/currenthistory.json.rabl | 7 ++++ app/views/movies/show.json.rabl | 8 ----- config/routes.rb | 14 ++++++-- test/models/customer_test.rb | 8 ----- test/models/movie_test.rb | 8 ----- 12 files changed, 91 insertions(+), 35 deletions(-) create mode 100644 app/views/customers/currenthistory.json.rabl create mode 100644 app/views/layouts/empty.json.rabl create mode 100644 app/views/movies/currenthistory.json.rabl diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 17a8801e6..da41de26b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,5 @@ class CustomersController < ApplicationController + before_action :find_customer, only: [:current, :history] def index sort_options = ["name", "registered_at", "postal_code"] @@ -10,9 +11,37 @@ def zomg render "customers/zomg.json.rabl", status: :ok end + def current + @rentals = @customer.rentals.select {|rental| rental.checkin_date == nil} + + if @rentals.empty? + render "layouts/empty.json", status: :ok + else + render "customers/currenthistory.json", status: :ok + end + end + + def history + @rentals = @customer.rentals.select {|rental| rental.checkout_date < Date.current} + + if @rentals.empty? + render "layouts/empty.json", status: :ok + else + render "customers/currenthistory.json", status: :ok + end + end + private def customer_params params.require(:customer).permit(:name, :registered_at, :address, :city, :state, :postal_code, :phone, :sort, :p, :n) end + + def find_customer + @customer = Customer.find_by(id: params[:id]) + + if @customer.nil? + return render "layouts/notfound.json", status: :not_found + end + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e2e5dd268..37b79584f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,4 +1,5 @@ class MoviesController < ApplicationController + before_action :find_movie, only: [:show, :current, :history] def index sort_options = ["title", "release_date"] @@ -7,13 +8,7 @@ def index end def show - @movie = Movie.find_by(id: params[:id]) - - if @movie.nil? - render "layouts/notfound.json", status: :not_found - else - render "movies/show.json", status: :ok - end + render "movies/show.json", status: :ok end def create @@ -25,9 +20,37 @@ def create end end + def current + @rentals = @movie.rentals.select {|rental| rental.checkin_date == nil} + + if @rentals.empty? + render "layouts/empty.json", status: :ok + else + render "movies/currenthistory.json", status: :ok + end + end + + def history + @rentals = @movie.rentals.select {|rental| rental.checkout_date < Date.current} + + if @rentals.empty? + render "layouts/empty.json", status: :ok + else + render "movies/currenthistory.json", status: :ok + end + end + private def movie_params params.permit(:title, :overview, :release_date, :inventory, :sort, :p, :n) end + + def find_movie + @movie = Movie.find_by(id: params[:id]) + + if @movie.nil? + render "layouts/notfound.json", status: :not_found + end + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d9f66348a..e11551765 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -32,6 +32,10 @@ def checkin end end + def overdue + @rentals = Rental.all.where(checkin_date: nil).where("due_date < ?", Date.current) + end + private def rental_params diff --git a/app/models/customer.rb b/app/models/customer.rb index e8cd106a5..aa143d7fa 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,5 @@ class Customer < ApplicationRecord has_many :rentals - has_many :movies, through: :rentals validates :name, presence: true validates :registered_at, presence: true diff --git a/app/models/movie.rb b/app/models/movie.rb index 5275530d5..88ef61faa 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,5 @@ class Movie < ApplicationRecord has_many :rentals - has_many :customers, through: :rentals validates :title, presence: true validates :overview, presence: true diff --git a/app/views/customers/currenthistory.json.rabl b/app/views/customers/currenthistory.json.rabl new file mode 100644 index 000000000..05d046678 --- /dev/null +++ b/app/views/customers/currenthistory.json.rabl @@ -0,0 +1,7 @@ +collection @rentals + +attributes :checkout_date, :due_date + +child :movie do + attributes :title +end diff --git a/app/views/layouts/empty.json.rabl b/app/views/layouts/empty.json.rabl new file mode 100644 index 000000000..ec4c20c5a --- /dev/null +++ b/app/views/layouts/empty.json.rabl @@ -0,0 +1,2 @@ +node(:ok) { true } +node(:message) { "no records found" } diff --git a/app/views/movies/currenthistory.json.rabl b/app/views/movies/currenthistory.json.rabl new file mode 100644 index 000000000..2d14e75ef --- /dev/null +++ b/app/views/movies/currenthistory.json.rabl @@ -0,0 +1,7 @@ +collection @rentals + +attributes :checkout_date, :due_date + +child :customer do + attributes :id, :name, :postal_code +end diff --git a/app/views/movies/show.json.rabl b/app/views/movies/show.json.rabl index 422b68cd7..c1c3c9832 100644 --- a/app/views/movies/show.json.rabl +++ b/app/views/movies/show.json.rabl @@ -2,11 +2,3 @@ object @movie node(:ok) { true } attributes :id, :title, :overview, :release_date, :inventory, :available_inventory - -# child :rentals do -# attributes :id, :checkout_date, :due_date -# end -# -# child :customers do -# attributes :id, :name -# end diff --git a/config/routes.rb b/config/routes.rb index d0342f44b..2e21f223d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,18 @@ Rails.application.routes.draw do - resources :customers, only: [:index] + get "/zomg", to: "customers#zomg", as: 'zomg' + + # Movies resources :movies, only: [:index, :show, :create] + get '/movies/:id/current', to: 'movies#current', as: 'movies_current' + get '/movies/:id/history', to: 'movies#history', as: 'movies_history' - get "/zomg", to: "customers#zomg", as: 'zomg' + # Customers + resources :customers, only: [:index] + get '/customers/:id/current', to: 'customers#current', as: 'customers_current' + get '/customers/:id/history', to: 'customers#history', as: 'customers_history' + + #Rentals post '/rentals/check-out', to: 'rentals#checkout', as: 'check_out' post '/rentals/check-in', to: 'rentals#checkin', as: 'check_in' + get '/rentals/overdue', to: 'rentals#overdue', as: 'overdue' end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 0b40561c9..a3670991f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -63,14 +63,6 @@ customer = Customer.new expect(customer.rentals.count).must_equal 0 end - - it "can access movies through rentals" do - expect(customer.movies.length).must_be :>=, 0 - - customer.movies.each do |movie| - expect(movie).must_be_instance_of Movie - end - end end describe "Custom Methods" do diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 2619f2936..3d9ca9b83 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -45,14 +45,6 @@ movie = Movie.new expect(movie.rentals.count).must_equal 0 end - - it "can access customers through rentals" do - expect(movie.customers.length).must_be :>=, 0 - - movie.customers.each do |customer| - expect(customer).must_be_instance_of Customer - end - end end describe "Custom Methods" do From 2f2edfbcb7e0cf8ec809a06f7d8733715873da91 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Wed, 7 Nov 2018 20:47:08 -0800 Subject: [PATCH 30/40] Broke some things and now learning SQL --- app/controllers/application_controller.rb | 14 ++++++++++++++ app/controllers/movies_controller.rb | 14 ++++---------- app/models/movie.rb | 1 + app/views/customers/currenthistory.json.rabl | 1 + app/views/customers/index.json.rabl | 1 + ...{currenthistory.json.rabl => current.json.rabl} | 1 + app/views/movies/errors.json.rabl | 1 + app/views/movies/index.json.rabl | 1 + app/views/movies/notfound.json.rabl | 2 -- app/views/rentals/errors.json.rabl | 1 + app/views/rentals/transaction.json.rabl | 1 + 11 files changed, 26 insertions(+), 12 deletions(-) rename app/views/movies/{currenthistory.json.rabl => current.json.rabl} (86%) delete mode 100644 app/views/movies/notfound.json.rabl diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b2b8db75b..2cc758f1f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,18 @@ class ApplicationController < ActionController::API + def current_data(entity) + list = entity.rentals.where(checkin_date: nil) + + if list.empty? + render "layouts/empty.json", status: :ok + else + return list + end + end + + def history_data + end + private def bad_request @@ -19,6 +32,7 @@ def integer?(x) def sort_and_paginate(options, list, params) if params[:sort] if options.include? params[:sort] + binding.pry list = list.all.order(params[:sort]) else return bad_request diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 37b79584f..f0c5b69b1 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,9 +7,7 @@ def index @movies = sort_and_paginate(sort_options, list, params) end - def show - render "movies/show.json", status: :ok - end + def show; end def create @movie = Movie.new(movie_params) @@ -21,13 +19,9 @@ def create end def current - @rentals = @movie.rentals.select {|rental| rental.checkin_date == nil} - - if @rentals.empty? - render "layouts/empty.json", status: :ok - else - render "movies/currenthistory.json", status: :ok - end + sort_options = ["name", "postal_code"] + list = current_data(@movie) + @rentals = sort_and_paginate(sort_options, list, params) end def history diff --git a/app/models/movie.rb b/app/models/movie.rb index 88ef61faa..5275530d5 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, presence: true validates :overview, presence: true diff --git a/app/views/customers/currenthistory.json.rabl b/app/views/customers/currenthistory.json.rabl index 05d046678..c2f7b3967 100644 --- a/app/views/customers/currenthistory.json.rabl +++ b/app/views/customers/currenthistory.json.rabl @@ -1,5 +1,6 @@ collection @rentals +node(:ok) { true } attributes :checkout_date, :due_date child :movie do diff --git a/app/views/customers/index.json.rabl b/app/views/customers/index.json.rabl index 8926c1cb7..78aabba92 100644 --- a/app/views/customers/index.json.rabl +++ b/app/views/customers/index.json.rabl @@ -1,3 +1,4 @@ collection @customers +node(:ok) { true } attributes :id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count diff --git a/app/views/movies/currenthistory.json.rabl b/app/views/movies/current.json.rabl similarity index 86% rename from app/views/movies/currenthistory.json.rabl rename to app/views/movies/current.json.rabl index 2d14e75ef..78547ea3f 100644 --- a/app/views/movies/currenthistory.json.rabl +++ b/app/views/movies/current.json.rabl @@ -1,5 +1,6 @@ collection @rentals +node(:ok) { true } attributes :checkout_date, :due_date child :customer do diff --git a/app/views/movies/errors.json.rabl b/app/views/movies/errors.json.rabl index 1840690bc..601bc7e2e 100644 --- a/app/views/movies/errors.json.rabl +++ b/app/views/movies/errors.json.rabl @@ -1,5 +1,6 @@ object @movie +node(:ok) { false } node(:errors) { |movie| movie.errors.messages } diff --git a/app/views/movies/index.json.rabl b/app/views/movies/index.json.rabl index 384d1c219..93d234d0b 100644 --- a/app/views/movies/index.json.rabl +++ b/app/views/movies/index.json.rabl @@ -1,3 +1,4 @@ collection @movies +node(:ok) { true } attributes :id, :title, :release_date diff --git a/app/views/movies/notfound.json.rabl b/app/views/movies/notfound.json.rabl deleted file mode 100644 index 0394b286c..000000000 --- a/app/views/movies/notfound.json.rabl +++ /dev/null @@ -1,2 +0,0 @@ -node(:ok) { false } -node(:message) { "not found" } diff --git a/app/views/rentals/errors.json.rabl b/app/views/rentals/errors.json.rabl index 5d51decfc..b576bf42d 100644 --- a/app/views/rentals/errors.json.rabl +++ b/app/views/rentals/errors.json.rabl @@ -1,5 +1,6 @@ object @rental +node(:ok) { false } node(:errors) { |rental| rental.errors.messages } diff --git a/app/views/rentals/transaction.json.rabl b/app/views/rentals/transaction.json.rabl index a159f50f1..4a6400e6d 100644 --- a/app/views/rentals/transaction.json.rabl +++ b/app/views/rentals/transaction.json.rabl @@ -1,5 +1,6 @@ object @rental +node(:ok) { true } attributes :checkout_date, :due_date, :checkin_date child :movie do From e46988ecaafacb3b19b52294f2a596807b33a871 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Thu, 8 Nov 2018 09:47:26 -0800 Subject: [PATCH 31/40] Changed current.json.rabl --- app/views/customers/current.json.rabl | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 app/views/customers/current.json.rabl diff --git a/app/views/customers/current.json.rabl b/app/views/customers/current.json.rabl new file mode 100644 index 000000000..62b0208d1 --- /dev/null +++ b/app/views/customers/current.json.rabl @@ -0,0 +1,7 @@ +collection @rentals +attributes :checkout_date, :due_date + +child :movie do + condition = lambda {|child| child.checkin_date == nil} + attributes :checkout_date, :due_date, :if => condition +end From 6d15ba2c607493a9ff252f1a899e77c03faf2c54 Mon Sep 17 00:00:00 2001 From: Hannah Date: Thu, 8 Nov 2018 11:17:40 -0800 Subject: [PATCH 32/40] adjusted tests to include ok in index json views --- app/controllers/application_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2cc758f1f..8b7f6cbee 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -32,7 +32,7 @@ def integer?(x) def sort_and_paginate(options, list, params) if params[:sort] if options.include? params[:sort] - binding.pry + # binding.pry list = list.all.order(params[:sort]) else return bad_request diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b9cf06c54..90a98f483 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,7 +27,7 @@ end it "returns customers with exactly the required fields" do - fields = %w(id movies_checked_out_count name phone postal_code registered_at) + fields = %w(id movies_checked_out_count name ok phone postal_code registered_at) get customers_path, as: :json diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 5cbed3306..d820daaa1 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -31,7 +31,7 @@ end it "returns movies with exactly the required fields" do - fields = %w(id release_date title) + fields = %w(id ok release_date title) get movies_path, as: :json From 173f622d9951592b4a66a2306d35047bd66ad2d1 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Thu, 8 Nov 2018 19:56:38 -0800 Subject: [PATCH 33/40] All fields can be sorted for movies and customers inventory management endpoints --- app/controllers/application_controller.rb | 52 +++++++++++++++++++---- app/controllers/customers_controller.rb | 16 +++---- app/controllers/movies_controller.rb | 18 +++++--- app/views/customers/current.json.rabl | 8 ++-- app/views/customers/history.json.rabl | 5 +++ app/views/movies/current.json.rabl | 9 ++-- app/views/movies/history.json.rabl | 5 +++ 7 files changed, 78 insertions(+), 35 deletions(-) create mode 100644 app/views/customers/history.json.rabl create mode 100644 app/views/movies/history.json.rabl diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2cc758f1f..dfb9668d5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,14 +3,13 @@ class ApplicationController < ActionController::API def current_data(entity) list = entity.rentals.where(checkin_date: nil) - if list.empty? - render "layouts/empty.json", status: :ok - else - return list - end + return list end - def history_data + def history_data(entity) + list = entity.rentals.select {|rental| rental.checkout_date < Date.current} + + return list end private @@ -32,13 +31,16 @@ def integer?(x) def sort_and_paginate(options, list, params) if params[:sort] if options.include? params[:sort] - binding.pry - list = list.all.order(params[:sort]) + if list.class == Array + list = list.sort_by{|item| item[params[:sort]]} + else + list = list.all.order(params[:sort]) + end else return bad_request end else - list = list.all.order(:id) + list = list.all.order(:id) if list.class != Array end if params[:n] @@ -55,4 +57,36 @@ def sort_and_paginate(options, list, params) return list end + + def multi_table_movie_details(list) + sort_options = ["customer_id", "name", "postal_code", "checkout_date","due_date"] + + details = [] + list.each do |rental| + details << { + "customer_id" => rental.customer_id, + "name" => rental.customer.name, + "postal_code" => rental.customer.postal_code, + "checkout_date" => rental.checkout_date, + "due_date" => rental.due_date + } + end + + return sort_and_paginate(sort_options, details, params) + end + + def multi_table_customer(list) + sort_options = ["title", "checkout_date", "due_date"] + + details = [] + list.each do |rental| + details << { + "title" => rental.movie.title, + "checkout_date" => rental.checkout_date, + "due_date" => rental.due_date + } + end + + return sort_and_paginate(sort_options, details, params) + end end diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index da41de26b..9a4cb21b6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -12,23 +12,23 @@ def zomg end def current - @rentals = @customer.rentals.select {|rental| rental.checkin_date == nil} + @rentals = current_data(@customer) if @rentals.empty? - render "layouts/empty.json", status: :ok - else - render "customers/currenthistory.json", status: :ok + return render "layouts/empty.json", status: :ok end + + @details = multi_table_customer(@rentals) end def history - @rentals = @customer.rentals.select {|rental| rental.checkout_date < Date.current} + @rentals = history_data(@customer) if @rentals.empty? - render "layouts/empty.json", status: :ok - else - render "customers/currenthistory.json", status: :ok + return render "layouts/empty.json", status: :ok end + + @details = multi_table_customer(@rentals) end private diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f0c5b69b1..e901015be 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -19,19 +19,23 @@ def create end def current - sort_options = ["name", "postal_code"] - list = current_data(@movie) - @rentals = sort_and_paginate(sort_options, list, params) + @rentals = current_data(@movie) + + if @rentals.empty? + return render "layouts/empty.json", status: :ok + end + + @details = multi_table_movie_details(@rentals) end def history - @rentals = @movie.rentals.select {|rental| rental.checkout_date < Date.current} + @rentals = history_data(@customer) if @rentals.empty? - render "layouts/empty.json", status: :ok - else - render "movies/currenthistory.json", status: :ok + return render "layouts/empty.json", status: :ok end + + @details = multi_table_movie_details(@rentals) end private diff --git a/app/views/customers/current.json.rabl b/app/views/customers/current.json.rabl index 62b0208d1..cadd5c396 100644 --- a/app/views/customers/current.json.rabl +++ b/app/views/customers/current.json.rabl @@ -1,7 +1,5 @@ -collection @rentals -attributes :checkout_date, :due_date +collection @details -child :movie do - condition = lambda {|child| child.checkin_date == nil} - attributes :checkout_date, :due_date, :if => condition +node do |attribute| + attribute end diff --git a/app/views/customers/history.json.rabl b/app/views/customers/history.json.rabl new file mode 100644 index 000000000..cadd5c396 --- /dev/null +++ b/app/views/customers/history.json.rabl @@ -0,0 +1,5 @@ +collection @details + +node do |attribute| + attribute +end diff --git a/app/views/movies/current.json.rabl b/app/views/movies/current.json.rabl index 78547ea3f..cadd5c396 100644 --- a/app/views/movies/current.json.rabl +++ b/app/views/movies/current.json.rabl @@ -1,8 +1,5 @@ -collection @rentals +collection @details -node(:ok) { true } -attributes :checkout_date, :due_date - -child :customer do - attributes :id, :name, :postal_code +node do |attribute| + attribute end diff --git a/app/views/movies/history.json.rabl b/app/views/movies/history.json.rabl new file mode 100644 index 000000000..cadd5c396 --- /dev/null +++ b/app/views/movies/history.json.rabl @@ -0,0 +1,5 @@ +collection @details + +node do |attribute| + attribute +end From 11e63fcdf80b32272bf5f9a1b9b40ae89df26865 Mon Sep 17 00:00:00 2001 From: Hannah Date: Thu, 8 Nov 2018 20:13:01 -0800 Subject: [PATCH 34/40] finished overdue sort and paginate --- app/controllers/rentals_controller.rb | 23 ++++++++++++++++++++--- app/views/rentals/overdue.json.rabl | 5 +++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 app/views/rentals/overdue.json.rabl diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e11551765..74d1d0703 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,6 +1,6 @@ class RentalsController < ApplicationController - before_action :find_movie - before_action :find_customer + before_action :find_movie, except: [:overdue] + before_action :find_customer, except: [:overdue] def checkout if @movie.available? && !@customer.overdue_items? @@ -33,7 +33,24 @@ def checkin end def overdue - @rentals = Rental.all.where(checkin_date: nil).where("due_date < ?", Date.current) + sort_options = ["movie_id", "title", "customer_id", "name", "postal_code", "checkout_date", "due_date"] + + @rentals = Rental.all.where(checkin_date: nil).where("due_date > ?", Date.current) + + @details = [] + @rentals.each do |rental| + @details << { + "movie_id" => rental.movie_id, + "title" => rental.movie.title, + "customer_id" => rental.customer_id, + "name" => rental.customer.name, + "postal_code" => rental.customer.postal_code, + "checkout_date" => rental.checkout_date, + "due_date" => rental.due_date + } + end + @details = sort_and_paginate(sort_options, @details, params) + end private diff --git a/app/views/rentals/overdue.json.rabl b/app/views/rentals/overdue.json.rabl new file mode 100644 index 000000000..a851c98e5 --- /dev/null +++ b/app/views/rentals/overdue.json.rabl @@ -0,0 +1,5 @@ +collection @details + +node do |attribute| + attribute +end From c87d078addb1843b781acab9900413c71107c27b Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Thu, 8 Nov 2018 20:27:20 -0800 Subject: [PATCH 35/40] Completed tests for current methods in customer and movies controller --- test/controllers/customers_controller_test.rb | 32 +++++ test/controllers/movies_controller_test.rb | 126 ++---------------- 2 files changed, 46 insertions(+), 112 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 90a98f483..2585718d7 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -94,4 +94,36 @@ must_respond_with :success end end + + describe "current" do + it "is a working route and returns json" do + get customers_current_path(customer.id), as: :json + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "returns an array" do + get customers_current_path(customer.id), as: :json + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Array + end + + it "returns an empty message if no results are found" do + Rental.destroy_all + + get customers_current_path(customer.id), as: :json + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "no records found" + must_respond_with :success + end + end + + describe "history" do + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d820daaa1..2d4e6bbfc 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -92,12 +92,9 @@ end describe "show" do - it "is a real working route and returns JSON" do - # Act get movie_path(movie.id), as: :json - # Assert expect(response.header['Content-Type']).must_include 'json' must_respond_with :success end @@ -163,130 +160,35 @@ end end - describe "check_out" do - it "can successfully check out a movie" do - movie = movies(:movieone) - starting_inventory = movie.available_inventory - - expect { - post check_out_path, params: {customer_id: customer.id, movie_id: movie.id} - }.must_change "Rental.count", 1 - - body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "checkout_date" + describe "current" do + it "is a working route and returns json" do + get movies_current_path(movie.id), as: :json - movie = Movie.find_by(id: movie.id) - expect(movie.available_inventory).must_equal (starting_inventory - 1) - - end - - it "does not check out a movie if there is not enough inventory" do - movie.available_inventory = 0 - movie.save - - expect { - post check_out_path, params: {customer_id: customer.id, movie_id: movie.id} - }.wont_change "Rental.count" - - body = JSON.parse(response.body) - - expect(body).must_be_kind_of Hash - expect(body).must_include "message" - expect(body["message"]).must_include "forbidden" - must_respond_with :forbidden + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success end - it "does not check out a movie if customer has overdue items" do - expect { - post check_out_path, params: {customer_id: customertwo.id, movie_id: movie.id} - }.wont_change "Rental.count" + it "returns an array" do + get movies_current_path(movie.id), as: :json body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "message" - expect(body["message"]).must_include "forbidden" - must_respond_with :forbidden + expect(body).must_be_kind_of Array end - it "does not check out a movie if rental information is invalid " do - movie = movies(:movieone) - starting_inventory = movie.available_inventory - - expect { - post check_out_path, params: {movie_id: movie.id} - }.wont_change "Rental.count" - - movie = Movie.find_by(id: movie.id) - expect(movie.available_inventory).must_equal starting_inventory + it "returns an empty message if no results are found" do + rentals(:rentalone).destroy + get movies_current_path(movie.id), as: :json body = JSON.parse(response.body) expect(body).must_be_kind_of Hash expect(body).must_include "message" - expect(body["message"]).must_include "not found" - must_respond_with :not_found + expect(body["message"]).must_include "no records found" + must_respond_with :success end end - describe "check_in" do - it "successfully checks in a movie" do - movie = movies(:movieone) - rental = rentals(:rentalone) - starting_inventory = movie.available_inventory - - expect { - post check_in_path, params: {customer_id: customer.id, movie_id: movie.id} - }.wont_change "Rental.count" - - body = JSON.parse(response.body) - expect(body).must_be_kind_of Hash - expect(body).must_include "checkout_date" - - movie = Movie.find_by(id: movie.id) - rental = Rental.find_by(id: rental.id) - expect(movie.available_inventory).must_equal starting_inventory + 1 - expect(rental.checkin_date).wont_be_nil - - end - - it "does not check in a movie if parameters are invalid" do - movie = movies(:movieone) - starting_inventory = movie.available_inventory - - expect { - post check_in_path, params: {customer_id: -1, movie_id: movie.id} - }.wont_change "Rental.count" - - body = JSON.parse(response.body) - - expect(body).must_be_kind_of Hash - expect(body).must_include "message" - expect(body["message"]).must_include "not found" - must_respond_with :not_found - - movie = Movie.find_by(id: movie.id) - expect(movie.available_inventory).must_equal starting_inventory - end - - it "does not check in if parameters are missing" do - movie = movies(:movieone) - starting_inventory = movie.available_inventory - - expect { - post check_in_path, params: {movie_id: movie.id} - }.wont_change "Rental.count" - - body = JSON.parse(response.body) - - expect(body).must_be_kind_of Hash - expect(body).must_include "message" - expect(body["message"]).must_include "not found" - must_respond_with :not_found - - movie = Movie.find_by(id: movie.id) - expect(movie.available_inventory).must_equal starting_inventory - end + describe "history" do end end From 0ef3d10afd094fc958ff4ed6f26c67fccbbf3dc2 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Thu, 8 Nov 2018 20:31:30 -0800 Subject: [PATCH 36/40] Completed history tests for movies and customers controller --- app/controllers/movies_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 26 +++++++++++++++++++ test/controllers/movies_controller_test.rb | 26 +++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e901015be..93b3a02a5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -29,7 +29,7 @@ def current end def history - @rentals = history_data(@customer) + @rentals = history_data(@movie) if @rentals.empty? return render "layouts/empty.json", status: :ok diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 2585718d7..4a7827500 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -125,5 +125,31 @@ end describe "history" do + it "is a working route and returns json" do + get customers_history_path(customer.id), as: :json + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "returns an array" do + get customers_history_path(customer.id), as: :json + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Array + end + + it "returns an empty message if no results are found" do + Rental.destroy_all + + get customers_history_path(customer.id), as: :json + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "no records found" + must_respond_with :success + end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2d4e6bbfc..c62c365c7 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -190,5 +190,31 @@ end describe "history" do + it "is a working route and returns json" do + get movies_history_path(movie.id), as: :json + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "returns an array" do + get movies_history_path(movie.id), as: :json + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Array + end + + it "returns an empty message if no results are found" do + Rental.destroy_all + + get movies_history_path(movie.id), as: :json + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "no records found" + must_respond_with :success + end end end From 429b6aded6faa555ca6a3a9786a68241b7184981 Mon Sep 17 00:00:00 2001 From: Hannah Date: Thu, 8 Nov 2018 20:58:20 -0800 Subject: [PATCH 37/40] rental controller tests written for rentals overdue --- app/controllers/rentals_controller.rb | 6 +++- test/controllers/rentals_controller_test.rb | 37 +++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 74d1d0703..4c1ac0bfc 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -35,7 +35,11 @@ def checkin def overdue sort_options = ["movie_id", "title", "customer_id", "name", "postal_code", "checkout_date", "due_date"] - @rentals = Rental.all.where(checkin_date: nil).where("due_date > ?", Date.current) + @rentals = Rental.all.where(checkin_date: nil).where("due_date < ?", Date.current) + + if @rentals.empty? + return render "layouts/empty.json", status: :ok + end @details = [] @rentals.each do |rental| diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d38e4fb88..4558649d1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -132,4 +132,41 @@ expect(movie.available_inventory).must_equal starting_inventory end end + + describe "overdue" do + it "is a real working route and returns JSON" do + get overdue_path, as: :json + + expect(response.header['Content-Type']).must_include 'json' + must_respond_with :success + end + + it "will return all overdue items that have not been checked in" do + get overdue_path, as: :json + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Array + expect(body.length).must_equal 1 + + expect(body[0]).must_include "movie_id" + + must_respond_with :success + end + + it "will render layouts/empty when there are no overdue items" do + rentals(:rentalone).checkin_date = "2018-11-08" + rentals(:rentalone).save + rentals(:rentalthree).checkin_date = "2018-10-10" + rentals(:rentalthree).save + + get overdue_path, as: :json + # binding.pry + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "message" + expect(body["message"]).must_include "no records found" + must_respond_with :ok + end + end end From 7e6529d590027c150bb2fb5831d3dcbb32909ecb Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Thu, 8 Nov 2018 20:58:38 -0800 Subject: [PATCH 38/40] Reorganized application controller --- app/controllers/application_controller.rb | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index dfb9668d5..81b15d60f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,17 +1,5 @@ class ApplicationController < ActionController::API - def current_data(entity) - list = entity.rentals.where(checkin_date: nil) - - return list - end - - def history_data(entity) - list = entity.rentals.select {|rental| rental.checkout_date < Date.current} - - return list - end - private def bad_request @@ -58,6 +46,18 @@ def sort_and_paginate(options, list, params) return list end + def current_data(entity) + list = entity.rentals.where(checkin_date: nil) + + return list + end + + def history_data(entity) + list = entity.rentals.select {|rental| rental.checkout_date < Date.current} + + return list + end + def multi_table_movie_details(list) sort_options = ["customer_id", "name", "postal_code", "checkout_date","due_date"] From 6964e470ed01634eec1972b53c84b559a06a1a58 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Thu, 8 Nov 2018 21:01:23 -0800 Subject: [PATCH 39/40] updated model relationships we weren't using --- app/models/movie.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 5275530d5..88ef61faa 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,5 @@ class Movie < ApplicationRecord has_many :rentals - has_many :customers, through: :rentals validates :title, presence: true validates :overview, presence: true From 3ae42b721d10bb339fd6114dc02a50866e663dd7 Mon Sep 17 00:00:00 2001 From: Alice Hsiao Date: Sun, 11 Nov 2018 15:34:43 -0800 Subject: [PATCH 40/40] Changed due date for customer in yml file --- test/fixtures/rentals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 21183cdae..b34e66fad 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -2,7 +2,7 @@ rentalone: checkout_date: 2018-11-04 - due_date: 2018-11-10 + due_date: "<%= Date.tomorrow %>" movie: movieone customer: customerone checkin_date: nil