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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@

# Ignore master key for decrypting credentials and more.
/config/master.key

.env
16 changes: 16 additions & 0 deletions app/controllers/movies_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,22 @@ def show
)
end

def add_movie
movie = Movie.new(
title: params["title"],
overview: params["overview"],
release_date: params["release_date"],
image_url: params["poster_path"],
external_id: params["external_id"]
)
puts movie
if movie.save
render status: :ok, json: {}
else
render status: :bad_request, json: { errors: movie.errors.messages }
end
end

private

def require_movie
Expand Down
6 changes: 5 additions & 1 deletion app/controllers/rentals_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ class RentalsController < ApplicationController
before_action :require_customer, only: [:check_out, :check_in]

# TODO: make sure that wave 2 works all the way

def check_out
rental = Rental.new(movie: @movie, customer: @customer, due_date: params[:due_date])

if rental.save
render status: :ok, json: {}
render status: :ok, json: { customer: @customer.as_json(
only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :account_credit],
methods: [:movies_checked_out_count]
) }
else
render status: :bad_request, json: { errors: rental.errors.messages }
end
Expand Down
1 change: 1 addition & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

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

post "/movies/add-movie", to: "movies#add_movie", as: "add_movie"
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
4 changes: 2 additions & 2 deletions node_modules/.yarn-integrity

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions node_modules/fsevents/build/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified node_modules/fsevents/build/Release/.node
Binary file not shown.
Binary file modified node_modules/fsevents/build/Release/fse.node
Binary file not shown.
Binary file modified node_modules/fsevents/build/Release/obj.target/fse/fsevents.o
Binary file not shown.
15 changes: 7 additions & 8 deletions node_modules/fsevents/build/config.gypi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions node_modules/fsevents/build/fse.target.mk

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 13 additions & 9 deletions node_modules/fsevents/build/gyp-mac-tool

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions node_modules/moment/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions node_modules/moment/dist/locale/de-at.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions node_modules/moment/dist/locale/de-ch.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading