Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .generators
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Reorder generators
2. Remove generators
3. Add installed generators
To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>
5 changes: 4 additions & 1 deletion app/controllers/rentals_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ def check_out
rental = Rental.new(video: @video, customer: @customer, due_date: params[:due_date])

if rental.save
render status: :ok, json: {}
render status: :ok,
json: rental.as_json(
only: [:customer_id, :video_id, :due_date, :checkout_date],
)
else
render status: :bad_request, json: { errors: rental.errors.messages }
end
Expand Down
19 changes: 19 additions & 0 deletions app/controllers/videos_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,27 @@ def show
)
end

def create
@video = Video.new(video_params)

if @video.save
render(
status: :ok,
json: @video.as_json(
only: [:title, :overview, :release_date, :external_id, :image_url],
)
)
else
render json: {ok: false, cause: "validation errors", errors: @video.errors}, status: :bad_request
end
end

private

def video_params
return params.permit(:external_id, :overview, :image_url, :release_date, :title, :inventory)
end

def require_video
@video = Video.find_by(title: params[:title])
unless @video
Expand Down
4 changes: 2 additions & 2 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

resources :customers, only: [:index]

resources :videos, only: [:index, :show], param: :title

resources :videos, only: [:index, :show, :create], param: :title
# post "/videos/:title/add-to-library", to:"videos#add_to_library", as: "add_to_library"
post "/rentals/:title/check-out", to: "rentals#check_out", as: "check_out"
post "/rentals/:title/return", to: "rentals#check_in", as: "check_in"
get "/rentals/overdue", to: "rentals#overdue", as: "overdue"
Expand Down
22 changes: 22 additions & 0 deletions test/controllers/videos_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,26 @@ class VideosControllerTest < ActionDispatch::IntegrationTest
expect(data["errors"]).must_include "title"
end
end

describe 'create' do
let(:video_hash) {
{
title: 'Alf the movie',
overview: 'The most early 90s movie of all time',
release_date: '2837-01-12',
inventory: 6,
external_id: 987,
image_url: 'http://blahblah.com',
}
}

it 'can create a valid video' do
# Assert
expect {
post videos_path, params: video_hash
}.must_change 'Video.count', 1

must_respond_with :ok
end
end
end