From b7395bbd43a361bcbd2c84b594eaeb12aaebf753 Mon Sep 17 00:00:00 2001 From: Brenna Date: Wed, 14 Jun 2017 16:40:38 -0700 Subject: [PATCH 1/7] wrote create method and it works yayaya --- app/controllers/movies_controller.rb | 12 ++++++++++++ config/routes.rb | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 362e2791..657f1661 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -21,6 +21,18 @@ def show ) end + def create + # given JSON from addMovie in movie_view, create a movie in the db + movie = Movie.new(title: params["title"], overview: params["overview"], release_date: params["release_date"], image_url: params["image_url"]) + + if movie.save + render status: :ok, json: movie + else + render status: "Failed to create movie" + end + + end + private def require_movie diff --git a/config/routes.rb b/config/routes.rb index 54bf033e..15670179 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,10 +3,10 @@ resources :customers, only: [:index] - resources :movies, only: [:index, :show], param: :title + resources :movies, only: [:index, :show, :create], param: :title post "/rentals/:title/check-out", to: "rentals#check_out", as: "check_out" - post "/rentals/:title/return", to: "rentals#check_in", as: "check_in" + post "/rentals/:title/return", to: "rentals#scheck_in", as: "check_in" get "/rentals/overdue", to: "rentals#overdue", as: "overdue" From 7b99ae09d55f08b27c9b4e123ab5f5cc632329f3 Mon Sep 17 00:00:00 2001 From: Ashtn Date: Thu, 15 Jun 2017 09:44:40 -0700 Subject: [PATCH 2/7] fixed image bug --- app/models/movie.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index 0327a4d6..de6dee8e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -13,7 +13,12 @@ def image_url if !orig_value MovieWrapper::DEFAULT_IMG_URL else + puts "This is the orig_value" + orig_value + if orig_value.include?('http') + return orig_value + else MovieWrapper.construct_image_url(orig_value) + end end end end From d13d55678f0e2814c52f96a80271faa7024886a1 Mon Sep 17 00:00:00 2001 From: Ashtn Date: Thu, 15 Jun 2017 10:09:24 -0700 Subject: [PATCH 3/7] added inventory to movie params --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 657f1661..483cdcbd 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -23,7 +23,7 @@ def show def create # given JSON from addMovie in movie_view, create a movie in the db - movie = Movie.new(title: params["title"], overview: params["overview"], release_date: params["release_date"], image_url: params["image_url"]) + movie = Movie.new(title: params["title"], overview: params["overview"], release_date: params["release_date"], image_url: params["image_url"], inventory: params["inventory"]) if movie.save render status: :ok, json: movie From d3e2ea9f0ed819b44bf1983c3531a9a20df769c1 Mon Sep 17 00:00:00 2001 From: Ashtn Date: Fri, 16 Jun 2017 09:24:53 -0700 Subject: [PATCH 4/7] removed seed data --- db/seeds.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 36750f8e..412e650a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -4,6 +4,6 @@ Customer.create!(customer) end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) -end +# JSON.parse(File.read('db/seeds/movies.json')).each do |movie| +# Movie.create!(movie) +# end From 12132c21f0bf5b338978b405ffb8c893df99cde4 Mon Sep 17 00:00:00 2001 From: Brenna Date: Fri, 16 Jun 2017 10:21:47 -0700 Subject: [PATCH 5/7] added conditional to search method --- lib/movie_wrapper.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/movie_wrapper.rb b/lib/movie_wrapper.rb index 7bd05c0e..b6d4bb12 100644 --- a/lib/movie_wrapper.rb +++ b/lib/movie_wrapper.rb @@ -14,8 +14,13 @@ def self.search(query) return [] else movies = response["results"].map do |result| - self.construct_movie(result) + if Movie.exists?(release_date: result["release_date"]) + Movie.find_by_release_date(result["release_date"]) + else + self.construct_movie(result) + end end + # puts movies return movies end end @@ -24,11 +29,11 @@ def self.search(query) def self.construct_movie(api_result) Movie.new( - title: api_result["title"], - overview: api_result["overview"], - release_date: api_result["release_date"], - image_url: api_result["poster_path"], #(api_result["poster_path"] ? self.construct_image_url(api_result["poster_path"]) : nil), - external_id: api_result["id"]) + title: api_result["title"], + overview: api_result["overview"], + release_date: api_result["release_date"], + image_url: api_result["poster_path"], #(api_result["poster_path"] ? self.construct_image_url(api_result["poster_path"]) : nil), + external_id: api_result["id"]) end def self.construct_image_url(img_name) From 8f8fbb6bd4b1542995bc1aa3e96698b09e5fb510 Mon Sep 17 00:00:00 2001 From: Ashtn Date: Fri, 16 Jun 2017 10:46:46 -0700 Subject: [PATCH 6/7] created delete route and controller action --- app/controllers/movies_controller.rb | 4 ++++ config/routes.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 483cdcbd..9bb08595 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -33,6 +33,10 @@ def create end + def destroy + Movie.destroy(params["id"]) + end + private def require_movie diff --git a/config/routes.rb b/config/routes.rb index 15670179..2cce3b27 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ resources :customers, only: [:index] - resources :movies, only: [:index, :show, :create], param: :title + resources :movies, only: [:index, :show, :create, :destroy], param: :title post "/rentals/:title/check-out", to: "rentals#check_out", as: "check_out" post "/rentals/:title/return", to: "rentals#scheck_in", as: "check_in" From 2e8b8b6146cf9980d78ae4c27dff7164252ddba4 Mon Sep 17 00:00:00 2001 From: Brenna Date: Wed, 21 Jun 2017 14:04:34 -0700 Subject: [PATCH 7/7] fixed checkin route name --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 2cce3b27..955dcd70 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,7 @@ resources :movies, only: [:index, :show, :create, :destroy], param: :title post "/rentals/:title/check-out", to: "rentals#check_out", as: "check_out" - post "/rentals/:title/return", to: "rentals#scheck_in", as: "check_in" + post "/rentals/:title/return", to: "rentals#check_in", as: "check_in" get "/rentals/overdue", to: "rentals#overdue", as: "overdue"