From daf3b33956d797da9be42336d8a060e690687847 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 12:24:48 -0800 Subject: [PATCH 01/36] Initial rails setup --- .gitignore | 16 + Gemfile | 53 +++ Gemfile.lock | 170 ++++++++++ README.md | 303 +----------------- 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 | 35 ++ bin/spring | 17 + bin/update | 29 ++ config.ru | 5 + config/application.rb | 40 +++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 85 +++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++ config/environments/production.rb | 83 +++++ config/environments/test.rb | 42 +++ .../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 | 56 ++++ config/routes.rb | 3 + config/secrets.yml | 32 ++ config/spring.rb | 6 + db/seeds.rb | 14 +- lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + 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 | 26 ++ tmp/.keep | 0 vendor/.keep | 0 55 files changed, 946 insertions(+), 297 deletions(-) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/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/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/secrets.yml create mode 100644 config/spring.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/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..68ac019ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# 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 + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..4ae55c93d --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.4' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', 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] + +gem 'jquery-turbolinks' +group :development do + gem 'better_errors' + gem 'pry-rails' + gem 'binding_of_caller' +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..4a738acb5 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,170 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.4) + actionpack (= 5.1.4) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.4) + activesupport (= 5.1.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.4) + activesupport (= 5.1.4) + globalid (>= 0.3.6) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) + arel (~> 8.0) + activesupport (5.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + better_errors (2.4.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + binding_of_caller (0.7.3) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.1.0) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.2) + debug_inspector (0.0.3) + erubi (1.7.0) + ffi (1.9.18) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.1.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (0.1.4) + mini_portile2 (2.3.0) + minitest (5.10.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.18) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + pg (0.21.0) + pry (0.11.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.10.0) + rack (2.0.3) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.2.1) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.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.1) + 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) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.4) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.7) + rails (~> 5.1.4) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.16.0.pre.3 diff --git a/README.md b/README.md index e47ff3004..7db80e4ca 100644 --- a/README.md +++ b/README.md @@ -1,301 +1,24 @@ -# Project: VideoStoreAPI -The goal of this project is to create a system that a video store (remember those?) could use to track their inventory of rental videos and their list of customers. +# README -We will use Rails to construct a RESTful API. The purpose of this API is to quickly serve information about the store's video collection, customer information, and to update rental status. This repository provides two JSON datafiles to serve as the initial seeds for this system. +This README would normally document whatever steps are necessary to get the +application up and running. -This is a pair project. You and your partner should use all the techniques we've learned so far to keep yourselves organized and on track, and ensure that no requirements slip through the cracks. +Things you may want to cover: -## Learning Goals -Upon completing this project, students should be able to: +* Ruby version -- Build an ERD and set up ActiveRecord models for a given dataset / use-case -- Expose database contents through a web API -- Respond reasonably to bad user data in the context of an API -- Verify the correctness of an API using controller tests +* System dependencies -This is a [stage 2](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) project. +* Configuration -## Success Criteria -Your project will be evaluated against the following requirements: +* Database creation -- API conformance - - The provided smoke tests should pass (see the subfolder) - - Bad data sent to the API should result in an appropriate status code and helpful error -- Test coverage - - Models: All relations, validations, and custom model methods should include at least one positive and one negative test case - - Controllers: Every API endpoint should include at least one positive and one negative test case -- Style and Organization - - Business logic should be live in models +* Database initialization -## Project Baseline -- Read the API Requirements below and create a pseudo-code "routes" file that specifies - - The _endpoints_ your API will need - - The _HTTP verbs_ each endpoint will use - - Any data that must be provided to the endpoint in order for it to do its work -- Read the Seed Data description below and, bearing in mind the API Requirements, create an ERD for your database that specifies - - The _models_ your database will require - - The _attributes_ for each model - - Any _relationships_ between models -- Create a new Rails app to serve as the API - - **Create the rails app with:** `$ rails new . --api` -- Create a route that responds to `/zomg` that serves a json-encoded "it works!" +* How to run the test suite -## Wave 1: Database Models, Tables, & Seeds -- Generate Rails models and associations to match your ERD -- Use the provided seed script `db/seeds.rb` to import the provided JSON data into your database +* Services (job queues, cache servers, search engines, etc.) -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. +* Deployment instructions -### 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` | string | `YYYY-MM-DD`, Day the film was originally released -| `inventory` | integer | How many copies of the film the video store owns - -`customers.json` contains information about the customers that have rented with the store in the past. The data is presented as, you guessed it, an array of objects, with each object have the following key-value pairs: - -| Field | Datatype | Description -|------------------|----------|------------ -| `name` | string | The customer's name -| `registered_at` | string | `Wed, 29 Apr 2015 07:54:14 -0700`, When the customer first visited the store -| `address` | string | Street address -| `city` | string |   -| `state` | string |   -| `postal_code` | string |   -| `phone` | string | Primary contact phone number - -### Testing -As with all Rails projects, model testing is a requirement. You should have _at least_ one positive and one negative test case for each relation, validation, and custom function you add to your models. - -Use good TDD practices, and test _before_ you code. Remember: red-green-refactor. - -## Waves 2 Coding The API -In this wave, you will implement the API described below. The endpoints are described more-or-less in order of complexity, and we recommend you build them in that order. Every endpoint must serve JSON data, and must use HTTP response codes to indicate the status of the request. - -The schema of your database and the structure of your rails app are completely up to you, so long as the API conforms to the description and provided script. - -### Error Handling -If something goes wrong, your API should return an appropriate [HTTP status code](http://billpatrianakos.me/blog/2013/10/13/list-of-rails-status-code-symbols/), as well as a list of errors. The list should be formatted like this: - -```json -{ - "errors": { - "title": ["Movie 'Revenge of the Gnomes' not found"] - } -} -``` - -All errors your API can return should be covered by at least one test case. - -### Testing -Because APIs are often open to the public, thorough testing is essential. For a Rails API, that means controller testing. - -For each API endpoint, you should have _at least_: -- A basic test with no parameters, if applicable -- Positive and negative tests for any URI parameters (user ID, movie title) -- Testing around any data in the request body - -Use good TDD practices, and test _before_ you code. Remember: red-green-refactor. - -#### Smoke Tests -Because this API will be used as the backend for a future project, there are strict requirements about how it should be structured. To this end, we have provided a set of [smoke tests](http://softwaretestingfundamentals.com/smoke-testing/) written in Postman to exercise all the endpoints. - -The smoke tests will verify that your API looks correct to the outside world, by sending actual HTTP requests to your running server and checking the results. They test things like: - -- Did I get a success response for a valid request? -- Did the API return JSON? -- Does the JSON contain the expected property names? - -**The smoke tests are not a substitute for writing your own tests!!!!!** They do **not** check that the content is _correct_, nor do they cover any negative or edge cases. Verifying correctness in these cases is **your** responsibility. - -The smoke tests live in the file [`test/VideoStoreAPI_smoke_tests.postman_collection.json`](test/VideoStoreAPI_smoke_tests.postman_collection.json). To run them: - -1. Open Postman -1. Click `Import` in the top left -1. Drag-and-drop the file into the box -1. In the left sidebar, click on the `Collections` tab -1. There should now be an entry for the smoke tests. Hover over it and click the `>` icon for a detail view. 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 - -#### `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 - -### Optional 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. - -**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 -| `due_date` | string `YYYY-MM-DD` | When should this movie be checked back in? - -#### `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 - -#### `GET /rentals/overdue` -List all customers with overdue movies - -Fields to return: -- `title` -- `customer_id` -- `name` -- `postal_code` -- `checkout_date` -- `due_date` - -## Going Further -These really are **optional** - if you've gotten here and you have time left, that means you're moving speedy fast! - -### Query Parameters -Any endpoint that returns a list should accept 3 _optional_ [query parameters](http://guides.rubyonrails.org/action_controller_overview.html#parameters): - -| Name | Value | Description -|--------|---------|------------ -| `sort` | string | Sort objects by this field, in ascending order -| `n` | integer | Number of responses to return per page -| `p` | integer | Page of responses to return - -So, for an API endpoint like `GET /customers`, the following requests should be valid: -- `GET /customers`: All customers, sorted by ID -- `GET /customers?sort=name`: All customers, sorted by name -- `GET /customers?n=10&p=2`: Customers 10-19, sorted by ID -- `GET /customers?sort=name&n=10&p=2`: Customers 10-19, sorted by name - -Of course, adding new features means you should be adding new controller tests to verify them. - -Things to note: -- Sorting by ID is the rails default -- Possible sort fields: - - Customers can be sorted by `name`, `registered_at` and `postal_code` - - Movies can be sorted by `title` and `release_date` - - Overdue rentals can be sorted by `title`, `name`, `checkout_date` and `due_date` -- If the client requests both sorting and pagination, pagination should be relative to the sorted order -- Check out the [will_paginate gem](https://github.com/mislav/will_paginate) - -### More Endpoints: Inventory Management -All these endpoints should support all 3 query parameters. All fields are sortable. - -#### `GET /movies/: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) +* ... 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..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..104e40c1c --- /dev/null +++ b/bin/setup @@ -0,0 +1,35 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..7d3c866ff --- /dev/null +++ b/config/application.rb @@ -0,0 +1,40 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + 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.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..ad59bcd88 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: VideoStoreAPI_production 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..abc82221c --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..3bd8115ea --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,83 @@ +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 + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..8e5cbde53 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.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 + 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..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# 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. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..9a5c49cca --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: a5af97c8c550ac23bdad85743fc154f89028e299b4c486eff2eeeefd2fcdcf10d67742cc8d8c9a04776b089ec09496549de60d5c0880a71627c6fd276596d0a4 + +test: + secret_key_base: b84825061bac7f612157e3f5a676795e2202d13a7ccb8083fcc338c3e5f977695b7b619616e1e8c1e2ae0c21bc5b47d5ef3b2766b2df88310767c25dd629ad84 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..1beea2acc 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,7 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - Customer.create!(customer) -end - -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) -end +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..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/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..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 752e1adf9d85630f379451d738e021fa0e8c0844 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 13:50:25 -0800 Subject: [PATCH 02/36] Added movie, customer and rental models --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + app/models/rental.rb | 2 + db/migrate/20171106214240_create_movies.rb | 12 +++++ db/migrate/20171106214423_create_customers.rb | 16 +++++++ db/migrate/20171106214751_create_rentals.rb | 11 +++++ db/schema.rb | 48 +++++++++++++++++++ 7 files changed, 93 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20171106214240_create_movies.rb create mode 100644 db/migrate/20171106214423_create_customers.rb create mode 100644 db/migrate/20171106214751_create_rentals.rb create mode 100644 db/schema.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20171106214240_create_movies.rb b/db/migrate/20171106214240_create_movies.rb new file mode 100644 index 000000000..84782a1b7 --- /dev/null +++ b/db/migrate/20171106214240_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20171106214423_create_customers.rb b/db/migrate/20171106214423_create_customers.rb new file mode 100644 index 000000000..68beb4592 --- /dev/null +++ b/db/migrate/20171106214423_create_customers.rb @@ -0,0 +1,16 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.string :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + t.float :account_credit + + t.timestamps + end + end +end diff --git a/db/migrate/20171106214751_create_rentals.rb b/db/migrate/20171106214751_create_rentals.rb new file mode 100644 index 000000000..6754e5b66 --- /dev/null +++ b/db/migrate/20171106214751_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.integer :customer_id + t.integer :movie_id + t.string :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..8ba9efccc --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,48 @@ +# 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: 20171106214751) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.float "account_credit" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.integer "customer_id" + t.integer "movie_id" + t.string "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 54a418b247c3d65a648d7fe847d39b5f73ff45b5 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 13:51:01 -0800 Subject: [PATCH 03/36] created database and completed db migration --- Gemfile | 1 - config/routes.rb | 1 + test/fixtures/customers.yml | 21 +++++++++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/fixtures/rentals.yml | 11 +++++++++++ test/models/customer_test.rb | 9 +++++++++ test/models/movie_test.rb | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 8 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/Gemfile b/Gemfile index 4ae55c93d..5c94584a9 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,6 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end - # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.4' # Use postgresql as the database for Active Record diff --git a/config/routes.rb b/config/routes.rb index 787824f88..40c0b5629 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..d3f7d487e --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,21 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + account_create: 1.5 + +two: + name: MyString + registered_at: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + account_create: 1.5 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d774de5f1 --- /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: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..84ac60fdf --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + customer_id: 1 + movie_id: 1 + due_date: MyString + +two: + customer_id: 1 + movie_id: 1 + due_date: MyString diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end 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 From 506fcb115a34a6699c881a4d9e667af232664c77 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Mon, 6 Nov 2017 14:19:57 -0800 Subject: [PATCH 04/36] Add seeds to models --- db/seeds.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2acc..45fdfb5f6 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,16 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) +movies = JSON.parse(File.read('db/seeds/movies.json')) + +movies.each do |movie| + Movie.create!(movie) +end + + + +json = JSON.parse(File.read('db/seeds/customers.json')) + +json.each do |c| + Customer.create!(c) +end From 7c93e5da666c634002293b1cb90fdd984a0081a7 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Mon, 6 Nov 2017 14:29:02 -0800 Subject: [PATCH 05/36] Set up relationships --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ 3 files changed, 6 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..7d5e1e937 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +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 index dc614df15..550edbc33 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +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 index 79e3a65ca..e69118068 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :customers + belongs_to :movies end From e81a9ee52356488f6405c8856abd45f3d134fac9 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Mon, 6 Nov 2017 14:38:45 -0800 Subject: [PATCH 06/36] Fix relationships --- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- app/models/rental.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 7d5e1e937..1d05ffeba 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,4 @@ class Customer < ApplicationRecord has_many :rentals - has_many :movies, :through => :rentals + has_many :movies, through: :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 550edbc33..6237ce84b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,4 @@ class Movie < ApplicationRecord has_many :rentals - has_many :customers, :through => :rentals + has_many :customers, through: :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index e69118068..e001ff37c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,4 @@ class Rental < ApplicationRecord - belongs_to :customers - belongs_to :movies + belongs_to :customer + belongs_to :movie end From 94e266663ffa7185dad93dd9e9d8f59241ffd97d Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 14:48:23 -0800 Subject: [PATCH 07/36] Added routes for customers and movies --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 40c0b5629..af926f298 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +resources :movies, only: [:index, :show, :create] +resources :customers, only: [:index, :show] +# resources :rental end From a128fac67326ca0c1ba7a4ba8bd503898be10e63 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 14:52:13 -0800 Subject: [PATCH 08/36] Created movies and customers controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ 4 files changed, 18 insertions(+) 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/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 From 5bc7056649870ae301fda3da02373a66beb4f37b Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 15:05:17 -0800 Subject: [PATCH 09/36] Changed account_create to account_credit --- test/fixtures/customers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index d3f7d487e..806115347 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,7 +8,7 @@ one: state: MyString postal_code: MyString phone: MyString - account_create: 1.5 + account_credit: 1.5 two: name: MyString @@ -18,4 +18,4 @@ two: state: MyString postal_code: MyString phone: MyString - account_create: 1.5 + account_credit: 1.5 From 9a0cef3efc8c1783b8af0ccf2d2f4b980be9c1df Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 15:05:58 -0800 Subject: [PATCH 10/36] Passing test for customer index --- app/controllers/customers_controller.rb | 8 ++++++++ test/controllers/customers_controller_test.rb | 12 +++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..5cf852704 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,10 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + + render( + json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :account_credit]), + status: :ok + ) + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..095b3fee9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,13 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "is a real working route" do + get customers_path + must_respond_with :success + end + # it "must be a real test" do + # flunk "Need real tests" + # end + end end From 8bdfa6e0c1a84760d6cbe671b6513f7e489c554d Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 15:11:14 -0800 Subject: [PATCH 11/36] Passing test to return json --- test/controllers/customers_controller_test.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 095b3fee9..935bc90fe 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,12 +2,17 @@ describe CustomersController do describe "index" do + # Positive test it "is a real working route" do get customers_path must_respond_with :success end - # it "must be a real test" do - # flunk "Need real tests" - # end + + it "returns json" do + get customers_path + response.header['Content-Type'].must_include 'json' + end + + end end From ffe5d0041622d53694d387e86970366f673bba17 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 15:14:53 -0800 Subject: [PATCH 12/36] Passing test for array --- test/controllers/customers_controller_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 935bc90fe..81f031e29 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -13,6 +13,13 @@ response.header['Content-Type'].must_include 'json' end + it "returns an Array" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + end end From a1e0d58c36590acde6733db2fc8333f2a64e74ab Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 15:17:28 -0800 Subject: [PATCH 13/36] Passing test for checking if array and returning all customers --- test/controllers/customers_controller_test.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 81f031e29..6722cef1c 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -16,10 +16,18 @@ it "returns an Array" do get customers_path + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all customers" do + get customers_path + body = JSON.parse(response.body) body.length.must_equal Customer.count end + end end From 282fe824502a46f45e5ee77d3f1a25c91a8719e2 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 15:24:45 -0800 Subject: [PATCH 14/36] added phone field --- app/controllers/customers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 5cf852704..aec92d7cb 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,7 +3,7 @@ def index customers = Customer.all render( - json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :account_credit]), + json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit]), status: :ok ) end From dbadf5c9d4b1b1503411de8f4fe0be4da80a23da Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Mon, 6 Nov 2017 15:25:05 -0800 Subject: [PATCH 15/36] All positive tests passing --- test/controllers/customers_controller_test.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 6722cef1c..bb1bb61bd 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,7 +27,14 @@ body.length.must_equal Customer.count end + it "returns all customers with exactly the required fields" do + keys = %w(name registered_at address city state postal_code phone account_credit) - + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.must_equal keys + end + end end end From ba5b39668a1eaf8ec4c1e98c09ab70a0158186cc Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Mon, 6 Nov 2017 15:48:45 -0800 Subject: [PATCH 16/36] Test and Add Show method for customers --- app/controllers/customers_controller.rb | 12 +++++++ test/controllers/customers_controller_test.rb | 33 +++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index aec92d7cb..10e79afc6 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -7,4 +7,16 @@ def index status: :ok ) end + + def show + customer = Customer.find_by(id: params[:id]) + if customer + render( + json: customer.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit]), + status: :ok + ) + else + render json: {nothing: true}, status: :not_found + end + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index bb1bb61bd..891face0f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -36,5 +36,34 @@ customer.keys.must_equal keys end end - end -end + end #index tests + + describe "show" do + # This bit is up to you! + it "can get a customer" do + get customer_path(customers(:two).id) + must_respond_with :success + end + + it "responds correctly when a customer is not found" do + invalid_customer_id = Customer.last.id + 1 + get customer_path(invalid_customer_id) + + must_respond_with :not_found + + body = JSON.parse(response.body) + body.must_equal "nothing" => true + end + # it "responds correctly when pet is not found" do + # invalid_pet_id = Pet.all.last.id + 1 + # get pet_path(invalid_pet_id) + # + # must_respond_with :not_found + # + # body = JSON.parse(response.body) + # body.must_equal "nothing" => true + # end + end #show tests + + +end #all tests From f0398fcbd0148903f1b5c1cd81380062b931cab4 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Mon, 6 Nov 2017 15:55:27 -0800 Subject: [PATCH 17/36] add tests and index method for movies controller --- app/controllers/movies_controller.rb | 10 ++++++ test/controllers/movies_controller_test.rb | 40 ++++++++++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..e9dc51249 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,12 @@ class MoviesController < ApplicationController + + def index + movies = Movie.all + + render( + json: movies.as_json(only: [:id, :title, :release_date]), + status: :ok + ) + end + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..24f152d13 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,41 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + # Positive test + it "is a real working route" do + get movies_path + must_respond_with :success + end + # + + it "returns json" do + get movies_path + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + get movies_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns all movies with exactly the required fields" do + keys = %w(id title release_date) + + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.must_equal keys + end + end + end #index tests end From bbfeeb492cb49592e32a563032991055eb383c98 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Mon, 6 Nov 2017 16:17:34 -0800 Subject: [PATCH 18/36] Add create method and tests for movies --- app/controllers/movies_controller.rb | 29 ++++++++++ app/models/movie.rb | 3 + test/controllers/customers_controller_test.rb | 9 --- test/controllers/movies_controller_test.rb | 56 +++++++++++++++++++ 4 files changed, 88 insertions(+), 9 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e9dc51249..f732952bd 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,4 +9,33 @@ def index ) end + def show + movie = Movie.find_by(id: params[:id]) + + if movie + render( + json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), + status: :ok + ) + else + render json: {nothing: true}, status: :not_found + end + end + + def create + movie = Movie.new(movie_params) + if movie.save + render json: { id: movie.id}, status: :ok + else + render json: { errors: 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/models/movie.rb b/app/models/movie.rb index 6237ce84b..3c5170765 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,7 @@ class Movie < ApplicationRecord + + validates :title, presence: true + has_many :rentals has_many :customers, through: :rentals end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 891face0f..119f20845 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -54,15 +54,6 @@ body = JSON.parse(response.body) body.must_equal "nothing" => true end - # it "responds correctly when pet is not found" do - # invalid_pet_id = Pet.all.last.id + 1 - # get pet_path(invalid_pet_id) - # - # must_respond_with :not_found - # - # body = JSON.parse(response.body) - # body.must_equal "nothing" => true - # end end #show tests diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 24f152d13..ba822ec1e 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -38,4 +38,60 @@ end end end #index tests + + describe "show" do + # This bit is up to you! + it "can get a movie by id" do + get movie_path(movies(:two).id) + must_respond_with :success + end + + it "responds correctly when a movie is not found" do + invalid_movie_id = Movie.last.id + 1 + get movie_path(invalid_movie_id) + + must_respond_with :not_found + + body = JSON.parse(response.body) + body.must_equal "nothing" => true + end + end #show tests + + + describe "create movie" do + let(:movie_data) { + { + title: "Fake Movie", + overview: "A stirring adventure", + release_date: "1972-06-06", + invetory: 10 + } + } + + it "Creates a new movie" do + proc { + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count', 1 + + must_respond_with :success + end #creates movie + + it "Won't change the database if data is missing" do + invalid_movie_data = { + overview: "A stirring adventure", + release_date: "1972-06-06", + inventory: 10 + } + + proc { + post movies_path, params: {movie: invalid_movie_data} + }.wont_change 'Movie.count' + + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_equal "errors" => {"title" => ["can't be blank"]} + + end #missing data + end# create tests end From dd3822a450ed1c09b08f6831e4c2b997221f3619 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Mon, 6 Nov 2017 16:58:34 -0800 Subject: [PATCH 19/36] Add smoke test results and add id to customer params --- app/controllers/customers_controller.rb | 8 +- test/VideoStoreAPI.postman_test_run.json | 507 +++++++++++++++++++++ test/controllers/movies_controller_test.rb | 2 +- 3 files changed, 515 insertions(+), 2 deletions(-) create mode 100644 test/VideoStoreAPI.postman_test_run.json diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 10e79afc6..8f12cfacb 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,7 +3,7 @@ def index customers = Customer.all render( - json: customers.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit]), + json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit]), status: :ok ) end @@ -19,4 +19,10 @@ def show render json: {nothing: true}, status: :not_found end end + + private + + def customer_params + params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit) + end end diff --git a/test/VideoStoreAPI.postman_test_run.json b/test/VideoStoreAPI.postman_test_run.json new file mode 100644 index 000000000..84c378da6 --- /dev/null +++ b/test/VideoStoreAPI.postman_test_run.json @@ -0,0 +1,507 @@ +{ + "id": "7a476fe2-1d39-4361-9943-bea0a703af04", + "name": "VideoStoreAPI", + "allTests": [], + "timestamp": "2017-11-07T00:29:36.809Z", + "collection_id": "a496b9e6-1927-53ae-3118-7aa5d8d0969d", + "folder_id": 0, + "target_type": "collection", + "environment_id": "1878813c-7313-1fa1-0ce1-0c17d8f260e1", + "data": [], + "delay": 0, + "count": 1, + "collection": { + "id": "a496b9e6-1927-53ae-3118-7aa5d8d0969d", + "name": "VideoStoreAPI", + "description": "", + "order": [ + "427c8d71-0ae3-2d78-7f6a-666734839fc0", + "3da7fe6e-fd2d-9f7b-3294-18d0dda55869", + "727828f0-51a2-426d-a9d6-81f3ba214463", + "6a6b2324-6601-8e4e-2a30-ba5f294546c0", + "0da64998-5b7e-a34a-883c-5b05d60a66c4" + ], + "folders": [], + "folders_order": [], + "timestamp": 0, + "synced": true, + "remote_id": 0, + "owner": 0, + "sharedWithTeam": false, + "subscribed": false, + "remoteLink": "", + "remoteLinkUpdatedAt": null, + "public": false, + "createdAt": 1510013970981, + "updatedAt": 1510013970981, + "write": true, + "published": false, + "favorite": false, + "permissions": {}, + "syncedPermissions": {} + }, + "folder": null, + "environment": null, + "globals": [], + "results": [ + { + "name": "List Customers", + "id": "427c8d71-0ae3-2d78-7f6a-666734839fc0", + "url": "http://localhost:3000/customers", + "totalTime": 0, + "responseCode": { + "code": 200, + "name": "OK", + "detail": { + "name": "OK", + "detail": "Standard response for successful HTTP requests. The actual response will depend on the request method used. In a GET request, the response will contain an entity corresponding to the requested resource. In a POST request the response will contain an entity describing or containing the result of the action." + } + }, + "tests": { + "Status code is 200": true, + "Content-Type is present": true, + "Content-Type is application/json": true, + "Data is an array": true, + "Many customers were sent": true, + "All customers have id": false, + "All customers have name": true, + "All customers have registered_at": true, + "All customers have postal_code": true, + "All customers have phone": true, + "All customers have movies_checked_out_count": false + }, + "testPassFailCounts": { + "Status code is 200": { + "pass": 1, + "fail": 0 + }, + "Content-Type is present": { + "pass": 1, + "fail": 0 + }, + "Content-Type is application/json": { + "pass": 1, + "fail": 0 + }, + "Data is an array": { + "pass": 1, + "fail": 0 + }, + "Many customers were sent": { + "pass": 1, + "fail": 0 + }, + "All customers have id": { + "pass": 0, + "fail": 1 + }, + "All customers have name": { + "pass": 1, + "fail": 0 + }, + "All customers have registered_at": { + "pass": 1, + "fail": 0 + }, + "All customers have postal_code": { + "pass": 1, + "fail": 0 + }, + "All customers have phone": { + "pass": 1, + "fail": 0 + }, + "All customers have movies_checked_out_count": { + "pass": 0, + "fail": 1 + } + }, + "times": [ + "469" + ], + "allTests": [ + { + "Status code is 200": true, + "Content-Type is present": true, + "Content-Type is application/json": true, + "Data is an array": true, + "Many customers were sent": true, + "All customers have id": false, + "All customers have name": true, + "All customers have registered_at": true, + "All customers have postal_code": true, + "All customers have phone": true, + "All customers have movies_checked_out_count": false + } + ], + "time": "469", + "totalRequestTime": "469", + "iterationResults": {} + }, + { + "name": "List Movies", + "id": "3da7fe6e-fd2d-9f7b-3294-18d0dda55869", + "url": "http://localhost:3000/movies", + "totalTime": 0, + "responseCode": { + "code": 200, + "name": "OK", + "detail": { + "name": "OK", + "detail": "Standard response for successful HTTP requests. The actual response will depend on the request method used. In a GET request, the response will contain an entity corresponding to the requested resource. In a POST request the response will contain an entity describing or containing the result of the action." + } + }, + "tests": { + "Status code is 200": true, + "Content-Type is present": true, + "Content-Type is application/json": true, + "Data is an array": true, + "Many movies were sent": true, + "All movies have id": true, + "All movies have title": true, + "All movies have release_date": true + }, + "testPassFailCounts": { + "Status code is 200": { + "pass": 1, + "fail": 0 + }, + "Content-Type is present": { + "pass": 1, + "fail": 0 + }, + "Content-Type is application/json": { + "pass": 1, + "fail": 0 + }, + "Data is an array": { + "pass": 1, + "fail": 0 + }, + "Many movies were sent": { + "pass": 1, + "fail": 0 + }, + "All movies have id": { + "pass": 1, + "fail": 0 + }, + "All movies have title": { + "pass": 1, + "fail": 0 + }, + "All movies have release_date": { + "pass": 1, + "fail": 0 + } + }, + "times": [ + "62" + ], + "allTests": [ + { + "Status code is 200": true, + "Content-Type is present": true, + "Content-Type is application/json": true, + "Data is an array": true, + "Many movies were sent": true, + "All movies have id": true, + "All movies have title": true, + "All movies have release_date": true + } + ], + "time": "62", + "totalRequestTime": "62", + "iterationResults": {} + }, + { + "name": "Show Movie from List", + "id": "727828f0-51a2-426d-a9d6-81f3ba214463", + "url": "http://localhost:3000/movies/1", + "totalTime": 0, + "responseCode": { + "code": 200, + "name": "OK", + "detail": { + "name": "OK", + "detail": "Standard response for successful HTTP requests. The actual response will depend on the request method used. In a GET request, the response will contain an entity corresponding to the requested resource. In a POST request the response will contain an entity describing or containing the result of the action." + } + }, + "tests": { + "Status code is 200": true, + "Content-Type is present": true, + "Content-Type is application/json": true, + "Data is not an array": true, + "Movie has title": true, + "Movie has overview": true, + "Movie has release_date": true, + "Movie has inventory": true, + "Movie has available_inventory": false + }, + "testPassFailCounts": { + "Status code is 200": { + "pass": 1, + "fail": 0 + }, + "Content-Type is present": { + "pass": 1, + "fail": 0 + }, + "Content-Type is application/json": { + "pass": 1, + "fail": 0 + }, + "Data is not an array": { + "pass": 1, + "fail": 0 + }, + "Movie has title": { + "pass": 1, + "fail": 0 + }, + "Movie has overview": { + "pass": 1, + "fail": 0 + }, + "Movie has release_date": { + "pass": 1, + "fail": 0 + }, + "Movie has inventory": { + "pass": 1, + "fail": 0 + }, + "Movie has available_inventory": { + "pass": 0, + "fail": 1 + } + }, + "times": [ + "15" + ], + "allTests": [ + { + "Status code is 200": true, + "Content-Type is present": true, + "Content-Type is application/json": true, + "Data is not an array": true, + "Movie has title": true, + "Movie has overview": true, + "Movie has release_date": true, + "Movie has inventory": true, + "Movie has available_inventory": false + } + ], + "time": "15", + "totalRequestTime": "15", + "iterationResults": {} + }, + { + "name": "Create Movie", + "id": "6a6b2324-6601-8e4e-2a30-ba5f294546c0", + "url": "http://localhost:3000/movies", + "totalTime": 0, + "responseCode": { + "code": 400, + "name": "Bad Request", + "detail": { + "name": "Bad Request", + "detail": "The request cannot be fulfilled due to bad syntax." + } + }, + "tests": {}, + "testPassFailCounts": {}, + "times": [ + "23" + ], + "allTests": [ + {} + ], + "time": "23", + "totalRequestTime": "23", + "iterationResults": {} + } + ], + "totalPass": 25, + "totalFail": 3, + "totalTime": 569, + "lifecycle": "done", + "requests": [ + { + "name": "List Customers", + "id": "427c8d71-0ae3-2d78-7f6a-666734839fc0", + "url": "http://localhost:3000/customers", + "time": "2017-11-07T00:29:36.809Z", + "responseCode": { + "code": 200, + "name": "OK", + "detail": { + "name": "OK", + "detail": "Standard response for successful HTTP requests. The actual response will depend on the request method used. In a GET request, the response will contain an entity corresponding to the requested resource. In a POST request the response will contain an entity describing or containing the result of the action." + } + }, + "testPassFailCounts": { + "Status code is 200": { + "pass": 1, + "fail": 0 + }, + "Content-Type is present": { + "pass": 1, + "fail": 0 + }, + "Content-Type is application/json": { + "pass": 1, + "fail": 0 + }, + "Data is an array": { + "pass": 1, + "fail": 0 + }, + "Many customers were sent": { + "pass": 1, + "fail": 0 + }, + "All customers have id": { + "pass": 0, + "fail": 1 + }, + "All customers have name": { + "pass": 1, + "fail": 0 + }, + "All customers have registered_at": { + "pass": 1, + "fail": 0 + }, + "All customers have postal_code": { + "pass": 1, + "fail": 0 + }, + "All customers have phone": { + "pass": 1, + "fail": 0 + }, + "All customers have movies_checked_out_count": { + "pass": 0, + "fail": 1 + } + } + }, + { + "name": "List Movies", + "id": "3da7fe6e-fd2d-9f7b-3294-18d0dda55869", + "url": "http://localhost:3000/movies", + "time": "2017-11-07T00:29:36.809Z", + "responseCode": { + "code": 200, + "name": "OK", + "detail": { + "name": "OK", + "detail": "Standard response for successful HTTP requests. The actual response will depend on the request method used. In a GET request, the response will contain an entity corresponding to the requested resource. In a POST request the response will contain an entity describing or containing the result of the action." + } + }, + "testPassFailCounts": { + "Status code is 200": { + "pass": 1, + "fail": 0 + }, + "Content-Type is present": { + "pass": 1, + "fail": 0 + }, + "Content-Type is application/json": { + "pass": 1, + "fail": 0 + }, + "Data is an array": { + "pass": 1, + "fail": 0 + }, + "Many movies were sent": { + "pass": 1, + "fail": 0 + }, + "All movies have id": { + "pass": 1, + "fail": 0 + }, + "All movies have title": { + "pass": 1, + "fail": 0 + }, + "All movies have release_date": { + "pass": 1, + "fail": 0 + } + } + }, + { + "name": "Show Movie from List", + "id": "727828f0-51a2-426d-a9d6-81f3ba214463", + "url": "http://localhost:3000/movies/1", + "time": "2017-11-07T00:29:36.809Z", + "responseCode": { + "code": 200, + "name": "OK", + "detail": { + "name": "OK", + "detail": "Standard response for successful HTTP requests. The actual response will depend on the request method used. In a GET request, the response will contain an entity corresponding to the requested resource. In a POST request the response will contain an entity describing or containing the result of the action." + } + }, + "testPassFailCounts": { + "Status code is 200": { + "pass": 1, + "fail": 0 + }, + "Content-Type is present": { + "pass": 1, + "fail": 0 + }, + "Content-Type is application/json": { + "pass": 1, + "fail": 0 + }, + "Data is not an array": { + "pass": 1, + "fail": 0 + }, + "Movie has title": { + "pass": 1, + "fail": 0 + }, + "Movie has overview": { + "pass": 1, + "fail": 0 + }, + "Movie has release_date": { + "pass": 1, + "fail": 0 + }, + "Movie has inventory": { + "pass": 1, + "fail": 0 + }, + "Movie has available_inventory": { + "pass": 0, + "fail": 1 + } + } + }, + { + "name": "Create Movie", + "id": "6a6b2324-6601-8e4e-2a30-ba5f294546c0", + "url": "http://localhost:3000/movies", + "time": "2017-11-07T00:29:36.809Z", + "responseCode": { + "code": 400, + "name": "Bad Request", + "detail": { + "name": "Bad Request", + "detail": "The request cannot be fulfilled due to bad syntax." + } + }, + "testPassFailCounts": {} + } + ], + "synced": false +} \ No newline at end of file diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ba822ec1e..0c5427aca 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -64,7 +64,7 @@ title: "Fake Movie", overview: "A stirring adventure", release_date: "1972-06-06", - invetory: 10 + inventory: 10 } } From b93aca8022e4fdf0b613cb870bca19dcefa4c2a9 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Tue, 7 Nov 2017 09:20:50 -0800 Subject: [PATCH 20/36] no updates --- test/controllers/customers_controller_test.rb | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 119f20845..04de1cc12 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -36,25 +36,8 @@ customer.keys.must_equal keys end end - end #index tests - - describe "show" do - # This bit is up to you! - it "can get a customer" do - get customer_path(customers(:two).id) - must_respond_with :success - end - - it "responds correctly when a customer is not found" do - invalid_customer_id = Customer.last.id + 1 - get customer_path(invalid_customer_id) - - must_respond_with :not_found - - body = JSON.parse(response.body) - body.must_equal "nothing" => true - end - end #show tests + # Negative tests + end -end #all tests +end From 02c41dfc4067b6693cb31df2a7cfd44fd1408132 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Tue, 7 Nov 2017 09:21:24 -0800 Subject: [PATCH 21/36] added id to customer test --- app/controllers/movies_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f732952bd..d380bc4d7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -37,5 +37,7 @@ def movie_params params.require(:movie).permit(:title, :overview, :release_date, :inventory) end +# +# params.require(:movie).permit(:title, :overview, :release_date, :inventory) end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 119f20845..ece04a237 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -28,7 +28,7 @@ end it "returns all customers with exactly the required fields" do - keys = %w(name registered_at address city state postal_code phone account_credit) + keys = %w(id name registered_at address city state postal_code phone account_credit) get customers_path body = JSON.parse(response.body) From f66e95b12edc19ff3568b2289d5d448b0c0ed6fa Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Tue, 7 Nov 2017 09:26:49 -0800 Subject: [PATCH 22/36] add customers show test --- test/controllers/customers_controller_test.rb | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 8ce01aa91..c2a8aad83 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -37,7 +37,22 @@ end end - # Negative tests - end - + describe "show" do + # This bit is up to you! + it "can get a customer" do + get customer_path(customers(:two).id) + must_respond_with :success + end + + it "responds correctly when a customer is not found" do + invalid_customer_id = Customer.last.id + 1 + get customer_path(invalid_customer_id) + + must_respond_with :not_found + + body = JSON.parse(response.body) + body.must_equal "nothing" => true + end + end #show tests + end end From e55baf9af145107faa0879569162aae20c60a2b5 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Tue, 7 Nov 2017 10:17:58 -0800 Subject: [PATCH 23/36] Added test to index for movies --- app/controllers/movies_controller.rb | 4 +++ ...71107173334_add_checkedout_to_customers.rb | 5 +++ ...74124_add_available_inventory_to_movies.rb | 5 +++ db/schema.rb | 4 ++- test/controllers/customers_controller_test.rb | 36 +++++++++---------- test/controllers/movies_controller_test.rb | 10 +++++- 6 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 db/migrate/20171107173334_add_checkedout_to_customers.rb create mode 100644 db/migrate/20171107174124_add_available_inventory_to_movies.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d380bc4d7..746b89c24 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,10 +3,14 @@ class MoviesController < ApplicationController def index movies = Movie.all + if movies.count > 0 render( json: movies.as_json(only: [:id, :title, :release_date]), status: :ok ) + else + render json: {nothing: true} + end end def show diff --git a/db/migrate/20171107173334_add_checkedout_to_customers.rb b/db/migrate/20171107173334_add_checkedout_to_customers.rb new file mode 100644 index 000000000..8a0817a1d --- /dev/null +++ b/db/migrate/20171107173334_add_checkedout_to_customers.rb @@ -0,0 +1,5 @@ +class AddCheckedoutToCustomers < ActiveRecord::Migration[5.1] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/migrate/20171107174124_add_available_inventory_to_movies.rb b/db/migrate/20171107174124_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..1d7051e5a --- /dev/null +++ b/db/migrate/20171107174124_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.1] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 8ba9efccc..f577ba352 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: 20171106214751) do +ActiveRecord::Schema.define(version: 20171107174124) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -26,6 +26,7 @@ t.float "account_credit" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| @@ -35,6 +36,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/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c2a8aad83..14e674451 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -37,22 +37,22 @@ end end - describe "show" do - # This bit is up to you! - it "can get a customer" do - get customer_path(customers(:two).id) - must_respond_with :success - end - - it "responds correctly when a customer is not found" do - invalid_customer_id = Customer.last.id + 1 - get customer_path(invalid_customer_id) - - must_respond_with :not_found - - body = JSON.parse(response.body) - body.must_equal "nothing" => true - end - end #show tests - end + describe "show" do + # This bit is up to you! + it "can get a customer" do + get customer_path(customers(:two).id) + must_respond_with :success + end + + it "responds correctly when a customer is not found" do + invalid_customer_id = Customer.last.id + 1 + get customer_path(invalid_customer_id) + + must_respond_with :not_found + + body = JSON.parse(response.body) + body.must_equal "nothing" => true + end + end #show tests + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 0c5427aca..de327c86d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -37,6 +37,15 @@ movie.keys.must_equal keys end end + + # This test passes when yml fixture data is commented out; cannot run test with other tests. + # it "returns a message when list of movies is empty" do + # get movies_path + # must_respond_with :success + # + # body = JSON.parse(response.body) + # body.must_equal "nothing" => true + # end end #index tests describe "show" do @@ -57,7 +66,6 @@ end end #show tests - describe "create movie" do let(:movie_data) { { From 47dfc9494ad0b69bc45a728be9ec657aff8bc9ec Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Tue, 7 Nov 2017 10:53:09 -0800 Subject: [PATCH 24/36] Modified due_date data type --- .../20171107184223_change_due_date_type_to_string_rentals.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20171107184223_change_due_date_type_to_string_rentals.rb diff --git a/db/migrate/20171107184223_change_due_date_type_to_string_rentals.rb b/db/migrate/20171107184223_change_due_date_type_to_string_rentals.rb new file mode 100644 index 000000000..8c3893746 --- /dev/null +++ b/db/migrate/20171107184223_change_due_date_type_to_string_rentals.rb @@ -0,0 +1,5 @@ +class ChangeDueDateTypeToStringRentals < ActiveRecord::Migration[5.1] + def change + change_column :rentals, :due_date, 'date USING CAST(due_date AS date)' + end +end diff --git a/db/schema.rb b/db/schema.rb index f577ba352..ef56bc196 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: 20171107174124) do +ActiveRecord::Schema.define(version: 20171107184223) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -42,7 +42,7 @@ create_table "rentals", force: :cascade do |t| t.integer "customer_id" t.integer "movie_id" - t.string "due_date" + t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false end From 8334cc32b7f1c7a94df0eaafc5bcb79207ad1458 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Tue, 7 Nov 2017 10:53:42 -0800 Subject: [PATCH 25/36] Added routes for rentals --- config/routes.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index af926f298..19871f60d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,9 @@ resources :movies, only: [:index, :show, :create] resources :customers, only: [:index, :show] + +get '/rentals/overdue', to:'rentals#overdue', as: 'rentals_overdue' +post '/rentals/checkout', to:'rentals#checkout', as: 'rentals_checkout' +post '/rental/checkin', to:'rentals#checkin', as: 'rentals_checkin' # resources :rental end From c3865f93c0abb65f4bb36c8e8c6d8c25fac27b39 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Tue, 7 Nov 2017 10:54:27 -0800 Subject: [PATCH 26/36] Added method stubs for rentals --- app/controllers/rentals_controller.rb | 10 ++++++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..a1ea77d8c --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,10 @@ +class RentalsController < ApplicationController + def checkout + end + + def checkin + end + + def overdue + end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 6d0fc25a268943891b050bc3ac254019a3322c42 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Tue, 7 Nov 2017 11:42:50 -0800 Subject: [PATCH 27/36] Created rental test files --- test/controllers/rentals_controller_test.rb | 20 +++++++++++++++++--- test/fixtures/rentals.yml | 4 ++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..cd2356bab 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,21 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "checkout" do + let(:rental_data) { + { + movie_id: 1, + customer_id: 1, + due_date: Date.now + 4.days + } + } + + it "creates a checkout" do + proc { + post rentals_checkout_path, params: {rental: rental_data} + }.must_change 'Rental.count', 1 + + must_respond_with :success + end + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 84ac60fdf..342b80afd 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,9 +3,9 @@ one: customer_id: 1 movie_id: 1 - due_date: MyString + due_date: 2017-01-02 two: customer_id: 1 movie_id: 1 - due_date: MyString + due_date: 2017-01-08 From 46398c21329df28ea8038741d21900b4964b3fa7 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Tue, 7 Nov 2017 11:44:15 -0800 Subject: [PATCH 28/36] add due date method --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 14 ++++++++++++++ app/models/rental.rb | 5 +++++ test/controllers/rentals_controller_test.rb | 1 + test/fixtures/rentals.yml | 2 +- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 746b89c24..4af5ecaa8 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,7 +10,7 @@ def index ) else render json: {nothing: true} - end + end end def show diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a1ea77d8c..2063fe678 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,7 @@ class RentalsController < ApplicationController def checkout + rental = Rental.new(rental_params) + rental.save end def checkin @@ -7,4 +9,16 @@ def checkin def overdue end + + +private + +def rental_params + due_date = self.due_date + # puts due_date + params.require(:rental).permit(:movie_id, :customer_id, :due_date) +end + + + end diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..c1d93a42f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,9 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + +def self.due_date + due_date = (Date.today + 4.days) +end + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..f22105218 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,6 +1,7 @@ require "test_helper" describe RentalsController do + # it "must be a real test" do # flunk "Need real tests" # end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 84ac60fdf..fec2ffe8e 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,7 +3,7 @@ one: customer_id: 1 movie_id: 1 - due_date: MyString + due_date: "MyString" two: customer_id: 1 From 4a82d8255b752930ae145186d900ef53b834dec5 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Tue, 7 Nov 2017 12:10:39 -0800 Subject: [PATCH 29/36] Work on checkout --- app/controllers/rentals_controller.rb | 5 +++-- app/models/rental.rb | 6 +++--- config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 5 +++-- test/fixtures/rentals.yml | 22 +++++++++------------ 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2063fe678..354bdad9e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,7 @@ class RentalsController < ApplicationController def checkout + # due_date = self.due_date + due_date = (Date.today + 4.days) rental = Rental.new(rental_params) rental.save end @@ -14,11 +16,10 @@ def overdue private def rental_params - due_date = self.due_date + # puts due_date params.require(:rental).permit(:movie_id, :customer_id, :due_date) end - end diff --git a/app/models/rental.rb b/app/models/rental.rb index c1d93a42f..c777349d7 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,8 +2,8 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie -def self.due_date - due_date = (Date.today + 4.days) -end +# def self.due_date +# due_date = (Date.today + 4.days) +# end end diff --git a/config/routes.rb b/config/routes.rb index 19871f60d..82047623a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,6 @@ get '/rentals/overdue', to:'rentals#overdue', as: 'rentals_overdue' post '/rentals/checkout', to:'rentals#checkout', as: 'rentals_checkout' -post '/rental/checkin', to:'rentals#checkin', as: 'rentals_checkin' +post '/rentals/checkin', to:'rentals#checkin', as: 'rentals_checkin' # resources :rental end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index cd2356bab..f418e3921 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,8 +5,9 @@ let(:rental_data) { { movie_id: 1, - customer_id: 1, - due_date: Date.now + 4.days + customer_id: 1 + # , + # due_date: Date.today + 4.days } } diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 63fa1d56f..e9988b5fd 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,15 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - customer_id: 1 - movie_id: 1 -<<<<<<< HEAD - due_date: 2017-01-02 -======= - due_date: "MyString" ->>>>>>> 46398c21329df28ea8038741d21900b4964b3fa7 - -two: - customer_id: 1 - movie_id: 1 - due_date: 2017-01-08 +# one: +# customer_id: 1 +# movie_id: 1 +# due_date: 2017-01-02 +# +# two: +# customer_id: 1 +# movie_id: 1 +# due_date: 2017-01-08 From 8820e447e23cf7905aecb7a8544eeb3f4ef1ad67 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Tue, 7 Nov 2017 12:35:18 -0800 Subject: [PATCH 30/36] Fix rental test with help from Dan exclamation point --- app/controllers/rentals_controller.rb | 25 ++++++++++++++++++--- test/controllers/rentals_controller_test.rb | 11 +++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 354bdad9e..d8b20428c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,25 @@ class RentalsController < ApplicationController def checkout # due_date = self.due_date - due_date = (Date.today + 4.days) + # due_date = (Date.today + 4.days) + puts "about to create the instance" rental = Rental.new(rental_params) - rental.save + puts "rental" + puts rental + puts rental.class + puts rental.due_date + puts "in the method now" + puts rental_params + if rental.save + # success + puts "save worked" + else + # failure + puts "save didn't work: #{rental.errors.messages}" + end + puts "after the save #" + puts rental + puts rental.class end def checkin @@ -16,9 +32,12 @@ def overdue private def rental_params - + puts "Now i'm down here in the params" + # puts rental_params # puts due_date params.require(:rental).permit(:movie_id, :customer_id, :due_date) + # puts "Now i'm afer the require" + # puts rental_params end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f418e3921..f7bc2b9df 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,14 +4,17 @@ describe "checkout" do let(:rental_data) { { - movie_id: 1, - customer_id: 1 - # , - # due_date: Date.today + 4.days + movie_id: Movie.first.id, + customer_id: Customer.first.id, + due_date: Date.today + 4.days } } it "creates a checkout" do + puts "Starting Create" + + puts rental_data + proc { post rentals_checkout_path, params: {rental: rental_data} }.must_change 'Rental.count', 1 From 0c5704dd91a1693609d184b24fddb9e2117b77ac Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Tue, 7 Nov 2017 13:49:38 -0800 Subject: [PATCH 31/36] I dont know --- app/controllers/rentals_controller.rb | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d8b20428c..152d81d81 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,14 +2,8 @@ class RentalsController < ApplicationController def checkout # due_date = self.due_date # due_date = (Date.today + 4.days) - puts "about to create the instance" rental = Rental.new(rental_params) - puts "rental" - puts rental - puts rental.class - puts rental.due_date - puts "in the method now" - puts rental_params + if rental.save # success puts "save worked" @@ -17,9 +11,6 @@ def checkout # failure puts "save didn't work: #{rental.errors.messages}" end - puts "after the save #" - puts rental - puts rental.class end def checkin @@ -32,12 +23,7 @@ def overdue private def rental_params - puts "Now i'm down here in the params" - # puts rental_params - # puts due_date params.require(:rental).permit(:movie_id, :customer_id, :due_date) - # puts "Now i'm afer the require" - # puts rental_params end From d895f891acf50da64888798d075b4c23e843b99f Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Tue, 7 Nov 2017 14:21:36 -0800 Subject: [PATCH 32/36] Positive and failure test for checkout --- app/controllers/rentals_controller.rb | 16 ++++++++-------- app/models/rental.rb | 1 + test/controllers/rentals_controller_test.rb | 18 ++++++++++++++++++ test/models/customer_test.rb | 14 +++++++------- test/models/movie_test.rb | 14 +++++++------- test/models/rental_test.rb | 14 +++++++------- 6 files changed, 48 insertions(+), 29 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 152d81d81..a131e4a79 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,11 +5,13 @@ def checkout rental = Rental.new(rental_params) if rental.save + render json: { id: rental.id }, status: :ok # success - puts "save worked" + # puts "save worked" else + render json: { errors: rental.errors.messages }, status: :bad_request # failure - puts "save didn't work: #{rental.errors.messages}" + # puts "save didn't work: #{rental.errors.messages}" end end @@ -20,11 +22,9 @@ def overdue end -private - -def rental_params - params.require(:rental).permit(:movie_id, :customer_id, :due_date) -end - + private + def rental_params + params.require(:rental).permit(:movie_id, :customer_id, :due_date) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index c777349d7..45d475d90 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,7 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + validates :customer_id, :movie_id, presence: true # def self.due_date # due_date = (Date.today + 4.days) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f7bc2b9df..ee6d8f6cb 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -21,5 +21,23 @@ must_respond_with :success end + + # Failure classes + it "does not return success if bogus data is used" do + invalid_rental_data = { + movie_id: Movie.last.id + 1, + customer_id: Customer.first.id, + due_date: Date.today + 4.days + } + + proc { + post rentals_checkout_path, params: {rental: invalid_rental_data} + }.wont_change 'Rental.count' + + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_equal "errors" => {"movie" => ["must exist"]} + end end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..cd0b2320d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,9 @@ require "test_helper" -describe Customer do - let(:customer) { Customer.new } - - it "must be valid" do - value(customer).must_be :valid? - end -end +# describe Customer do +# let(:customer) { Customer.new } +# +# it "must be valid" do +# value(customer).must_be :valid? +# end +# end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..40cd72026 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,9 @@ require "test_helper" -describe Movie do - let(:movie) { Movie.new } - - it "must be valid" do - value(movie).must_be :valid? - end -end +# 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 index 6ea53d94f..97dcc8fcf 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,9 @@ require "test_helper" -describe Rental do - let(:rental) { Rental.new } - - it "must be valid" do - value(rental).must_be :valid? - end -end +# describe Rental do +# let(:rental) { Rental.new } +# +# it "must be valid" do +# value(rental).must_be :valid? +# end +# end From cc7db8c5453946c4fca54eaddf8ea5214fb81ca4 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Tue, 7 Nov 2017 14:25:19 -0800 Subject: [PATCH 33/36] commented out models --- test/models/customer_test.rb | 14 +++++++------- test/models/movie_test.rb | 14 +++++++------- test/models/rental_test.rb | 16 ++++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..cd0b2320d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,9 @@ require "test_helper" -describe Customer do - let(:customer) { Customer.new } - - it "must be valid" do - value(customer).must_be :valid? - end -end +# describe Customer do +# let(:customer) { Customer.new } +# +# it "must be valid" do +# value(customer).must_be :valid? +# end +# end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..40cd72026 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,9 @@ require "test_helper" -describe Movie do - let(:movie) { Movie.new } - - it "must be valid" do - value(movie).must_be :valid? - end -end +# 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 index 6ea53d94f..d8da1925c 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,9 @@ require "test_helper" - -describe Rental do - let(:rental) { Rental.new } - - it "must be valid" do - value(rental).must_be :valid? - end -end +# +# describe Rental do +# let(:rental) { Rental.new } +# +# it "must be valid" do +# value(rental).must_be :valid? +# end +# end From 4bd925d8c85954acb1b8c1bc173811ce5f3d48e4 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Tue, 7 Nov 2017 14:55:02 -0800 Subject: [PATCH 34/36] Update seed file to set available inventory --- db/seeds.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 45fdfb5f6..25f2ec151 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -6,11 +6,18 @@ # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) movies = JSON.parse(File.read('db/seeds/movies.json')) +puts movies +puts movies.class + + movies.each do |movie| - Movie.create!(movie) + movie["available_inventory"] = movie["inventory"] end +movies.each do |movie| + Movie.create!(movie) +end json = JSON.parse(File.read('db/seeds/customers.json')) From 2a1539a7855de782b21fd5b57b17e319f51e9a34 Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Wed, 8 Nov 2017 09:17:18 -0800 Subject: [PATCH 35/36] Tests and Fixutes --- app/controllers/movies_controller.rb | 6 +-- test/VideoStoreAPI.postman_test_run.json | 58 ++++++++++++------------ test/fixtures/movies.yml | 2 + 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4af5ecaa8..6d28c5d83 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -38,10 +38,10 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory, :available_inventory) end -# -# params.require(:movie).permit(:title, :overview, :release_date, :inventory) +# params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) +# params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) end diff --git a/test/VideoStoreAPI.postman_test_run.json b/test/VideoStoreAPI.postman_test_run.json index 84c378da6..639e15997 100644 --- a/test/VideoStoreAPI.postman_test_run.json +++ b/test/VideoStoreAPI.postman_test_run.json @@ -1,8 +1,8 @@ { - "id": "7a476fe2-1d39-4361-9943-bea0a703af04", + "id": "c4e949e2-ca19-4e6d-b1ca-56e5db774480", "name": "VideoStoreAPI", "allTests": [], - "timestamp": "2017-11-07T00:29:36.809Z", + "timestamp": "2017-11-08T00:14:30.167Z", "collection_id": "a496b9e6-1927-53ae-3118-7aa5d8d0969d", "folder_id": 0, "target_type": "collection", @@ -63,7 +63,7 @@ "Content-Type is application/json": true, "Data is an array": true, "Many customers were sent": true, - "All customers have id": false, + "All customers have id": true, "All customers have name": true, "All customers have registered_at": true, "All customers have postal_code": true, @@ -92,8 +92,8 @@ "fail": 0 }, "All customers have id": { - "pass": 0, - "fail": 1 + "pass": 1, + "fail": 0 }, "All customers have name": { "pass": 1, @@ -117,7 +117,7 @@ } }, "times": [ - "469" + "480" ], "allTests": [ { @@ -126,7 +126,7 @@ "Content-Type is application/json": true, "Data is an array": true, "Many customers were sent": true, - "All customers have id": false, + "All customers have id": true, "All customers have name": true, "All customers have registered_at": true, "All customers have postal_code": true, @@ -134,8 +134,8 @@ "All customers have movies_checked_out_count": false } ], - "time": "469", - "totalRequestTime": "469", + "time": "480", + "totalRequestTime": "480", "iterationResults": {} }, { @@ -196,7 +196,7 @@ } }, "times": [ - "62" + "70" ], "allTests": [ { @@ -210,14 +210,14 @@ "All movies have release_date": true } ], - "time": "62", - "totalRequestTime": "62", + "time": "70", + "totalRequestTime": "70", "iterationResults": {} }, { "name": "Show Movie from List", "id": "727828f0-51a2-426d-a9d6-81f3ba214463", - "url": "http://localhost:3000/movies/1", + "url": "http://localhost:3000/movies/2", "totalTime": 0, "responseCode": { "code": 200, @@ -277,7 +277,7 @@ } }, "times": [ - "15" + "20" ], "allTests": [ { @@ -292,8 +292,8 @@ "Movie has available_inventory": false } ], - "time": "15", - "totalRequestTime": "15", + "time": "20", + "totalRequestTime": "20", "iterationResults": {} }, { @@ -312,26 +312,26 @@ "tests": {}, "testPassFailCounts": {}, "times": [ - "23" + "27" ], "allTests": [ {} ], - "time": "23", - "totalRequestTime": "23", + "time": "27", + "totalRequestTime": "27", "iterationResults": {} } ], - "totalPass": 25, - "totalFail": 3, - "totalTime": 569, + "totalPass": 26, + "totalFail": 2, + "totalTime": 597, "lifecycle": "done", "requests": [ { "name": "List Customers", "id": "427c8d71-0ae3-2d78-7f6a-666734839fc0", "url": "http://localhost:3000/customers", - "time": "2017-11-07T00:29:36.809Z", + "time": "2017-11-08T00:14:30.167Z", "responseCode": { "code": 200, "name": "OK", @@ -362,8 +362,8 @@ "fail": 0 }, "All customers have id": { - "pass": 0, - "fail": 1 + "pass": 1, + "fail": 0 }, "All customers have name": { "pass": 1, @@ -391,7 +391,7 @@ "name": "List Movies", "id": "3da7fe6e-fd2d-9f7b-3294-18d0dda55869", "url": "http://localhost:3000/movies", - "time": "2017-11-07T00:29:36.809Z", + "time": "2017-11-08T00:14:30.167Z", "responseCode": { "code": 200, "name": "OK", @@ -438,8 +438,8 @@ { "name": "Show Movie from List", "id": "727828f0-51a2-426d-a9d6-81f3ba214463", - "url": "http://localhost:3000/movies/1", - "time": "2017-11-07T00:29:36.809Z", + "url": "http://localhost:3000/movies/2", + "time": "2017-11-08T00:14:30.167Z", "responseCode": { "code": 200, "name": "OK", @@ -491,7 +491,7 @@ "name": "Create Movie", "id": "6a6b2324-6601-8e4e-2a30-ba5f294546c0", "url": "http://localhost:3000/movies", - "time": "2017-11-07T00:29:36.809Z", + "time": "2017-11-08T00:14:30.167Z", "responseCode": { "code": 400, "name": "Bad Request", diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..22dc407bf 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,9 +5,11 @@ one: overview: MyString release_date: MyString inventory: 1 + available_invetory: 1 two: title: MyString overview: MyString release_date: MyString inventory: 1 + available_inventory: 1 From c8310021c809e874b77694e07be42680b2f9b07f Mon Sep 17 00:00:00 2001 From: Amy Cash Date: Wed, 8 Nov 2017 09:37:00 -0800 Subject: [PATCH 36/36] Fix Smoke Tests --- app/controllers/customers_controller.rb | 6 +++--- app/controllers/movies_controller.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 8f12cfacb..c5fb079b9 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -3,7 +3,7 @@ def index customers = Customer.all render( - json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit]), + json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit, :movies_checked_out_count]), status: :ok ) end @@ -12,7 +12,7 @@ def show customer = Customer.find_by(id: params[:id]) if customer render( - json: customer.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit]), + json: customer.as_json(only: [:name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit, :movies_checked_out_count]), status: :ok ) else @@ -23,6 +23,6 @@ def show private def customer_params - params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit) + params.require(:customer).permit(:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit, :movies_checked_out_count) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6d28c5d83..912c8c9df 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,7 +5,7 @@ def index if movies.count > 0 render( - json: movies.as_json(only: [:id, :title, :release_date]), + json: movies.as_json(only: [:id, :title, :release_date, :available_inventory]), status: :ok ) else @@ -18,7 +18,7 @@ def show if movie render( - json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), + json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok ) else