From 69f49aaf03e637288752ae6c3a906ea08c13d911 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Tue, 18 Dec 2018 12:02:21 -0800 Subject: [PATCH 01/14] update ruby version gemfile to 2.5.3 --- .gitignore | 5 +++++ Gemfile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4a494a75..58456ca4 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,8 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +# Elastic Beanstalk Files +.elasticbeanstalk/* +!.elasticbeanstalk/*.cfg.yml +!.elasticbeanstalk/*.global.yml diff --git a/Gemfile b/Gemfile index 2d53ba9c..7f721b54 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.1' +ruby '2.5.3' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' From 74163fa22f207d152169edb87ea19dd65ae7fedf Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Tue, 18 Dec 2018 12:07:18 -0800 Subject: [PATCH 02/14] Elastic Beanstalk changes --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 4a494a75..58456ca4 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,8 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +# Elastic Beanstalk Files +.elasticbeanstalk/* +!.elasticbeanstalk/*.cfg.yml +!.elasticbeanstalk/*.global.yml From 12f95114685194fd73d4fd62cf9e3846d7ed643b Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Tue, 18 Dec 2018 12:31:49 -0800 Subject: [PATCH 03/14] Change ruby version in gemfile to 2.5.1 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 7f721b54..2d53ba9c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.3' +ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' From b60ec3026e3aa852ce9e354237f5e514aa8c0e93 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Tue, 18 Dec 2018 17:03:04 -0800 Subject: [PATCH 04/14] create backend post request to videostore API --- Gemfile | 2 +- app/controllers/movies_controller.rb | 19 +++++++++++++++++++ config/routes.rb | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 7f721b54..2d53ba9c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.3' +ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 362e2791..afe1ad61 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -21,8 +21,27 @@ def show ) end + def create + movie = Movie.new(movie_params) + + if movie.save + render( + status: :ok, + json: movie.as_json( + only: [:id], + ) + ) + else + render_error(:bad_request, movie.errors.messages) + end + end + private + def movie_params + params.permit(:title, :overview, :release_date, :inventory) + end + def require_movie @movie = Movie.find_by(title: params[:title]) unless @movie diff --git a/config/routes.rb b/config/routes.rb index f4c99688..76715f9a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ 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" From bf873704f001df7f97b216fd135282f6b1bceddc Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Tue, 18 Dec 2018 22:30:08 -0800 Subject: [PATCH 05/14] update production database --- config/database.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config/database.yml b/config/database.yml index 50748d61..3b9343e6 100644 --- a/config/database.yml +++ b/config/database.yml @@ -21,7 +21,8 @@ test: production: <<: *default - database: _production - username: - password: <%= ENV['_DATABASE_PASSWORD'] %> - + database: <%= ENV['RDS_DB_NAME'] %> + username: <%= ENV['RDS_USERNAME'] %> + password: <%= ENV['RDS_PASSWORD'] %> + host: <%= ENV['RDS_HOSTNAME'] %> + port: <%= ENV['RDS_PORT'] %> From 83bcc242fd3b67f2c342ebc309eea2846f42e5e5 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 19 Dec 2018 09:55:49 -0800 Subject: [PATCH 06/14] update movie params: --- app/controllers/movies_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index afe1ad61..6d77f60f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -28,7 +28,7 @@ def create render( status: :ok, json: movie.as_json( - only: [:id], + only: [:id, :title], ) ) else @@ -39,7 +39,7 @@ def create private def movie_params - params.permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :image_url, :external_id) end def require_movie From 4e714a25fbfca2fce62ca7aa1f6218e0ae0306d1 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 19 Dec 2018 15:04:15 -0800 Subject: [PATCH 07/14] update movie backed image url --- app/models/movie.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 0016080b..251d8c4f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,8 +10,6 @@ def image_url orig_value = read_attribute :image_url if !orig_value MovieWrapper::DEFAULT_IMG_URL - elsif external_id - MovieWrapper.construct_image_url(orig_value) else orig_value end From 437b90511ccb6bdd33a4afebc61cf936ebf856ef Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 19 Dec 2018 15:04:33 -0800 Subject: [PATCH 08/14] update movie backed imageurl --- app/models/movie.rb | 2 ++ lib/movie_wrapper.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 251d8c4f..0016080b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,6 +10,8 @@ def image_url orig_value = read_attribute :image_url if !orig_value MovieWrapper::DEFAULT_IMG_URL + elsif external_id + MovieWrapper.construct_image_url(orig_value) else orig_value end diff --git a/lib/movie_wrapper.rb b/lib/movie_wrapper.rb index c51d05ee..c6045f81 100644 --- a/lib/movie_wrapper.rb +++ b/lib/movie_wrapper.rb @@ -35,7 +35,7 @@ def self.construct_movie(api_result) end def self.construct_image_url(img_name) - return BASE_IMG_URL + DEFAULT_IMG_SIZE + img_name + return img_name end end From 4b4201b9cb4fb6e6b72c1400312152b1edec2d51 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 19 Dec 2018 15:42:12 -0800 Subject: [PATCH 09/14] update backend construct image url --- app/models/movie.rb | 2 +- lib/movie_wrapper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 0016080b..d4fa2079 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,7 +10,7 @@ def image_url orig_value = read_attribute :image_url if !orig_value MovieWrapper::DEFAULT_IMG_URL - elsif external_id + elsif orig_value.length === 31 MovieWrapper.construct_image_url(orig_value) else orig_value diff --git a/lib/movie_wrapper.rb b/lib/movie_wrapper.rb index c6045f81..c51d05ee 100644 --- a/lib/movie_wrapper.rb +++ b/lib/movie_wrapper.rb @@ -35,7 +35,7 @@ def self.construct_movie(api_result) end def self.construct_image_url(img_name) - return img_name + return BASE_IMG_URL + DEFAULT_IMG_SIZE + img_name end end From d73809604c496786b488104e12c98c405847e77a Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 19 Dec 2018 15:43:43 -0800 Subject: [PATCH 10/14] change equal sign to ruby --- app/models/movie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index d4fa2079..4257df14 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,7 +10,7 @@ def image_url orig_value = read_attribute :image_url if !orig_value MovieWrapper::DEFAULT_IMG_URL - elsif orig_value.length === 31 + elsif orig_value.length == 31 MovieWrapper.construct_image_url(orig_value) else orig_value From 0961b00675b3aac187697025a3da393d05dde77a Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 19 Dec 2018 15:53:39 -0800 Subject: [PATCH 11/14] git push origin master --- app/models/movie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 4257df14..25d995a1 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,7 +10,7 @@ def image_url orig_value = read_attribute :image_url if !orig_value MovieWrapper::DEFAULT_IMG_URL - elsif orig_value.length == 31 + elsif orig_value.length != 31 MovieWrapper.construct_image_url(orig_value) else orig_value From 8bff39c9a4443404455c7e4f99274945f129ad1e Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 19 Dec 2018 16:08:18 -0800 Subject: [PATCH 12/14] update backend image_url working --- app/models/movie.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 25d995a1..e67e041f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,6 +2,7 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + def available_inventory self.inventory - Rental.where(movie: self, returned: false).length end @@ -10,7 +11,7 @@ def image_url orig_value = read_attribute :image_url if !orig_value MovieWrapper::DEFAULT_IMG_URL - elsif orig_value.length != 31 + elsif orig_value !~ %r{\Ahttps?://} MovieWrapper.construct_image_url(orig_value) else orig_value From c352bbe9456890b095bcc892841976690527b263 Mon Sep 17 00:00:00 2001 From: Katrina Aganon Date: Wed, 19 Dec 2018 16:24:53 -0800 Subject: [PATCH 13/14] image url finally working --- app/models/movie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index e67e041f..4ed867f4 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -11,7 +11,7 @@ def image_url orig_value = read_attribute :image_url if !orig_value MovieWrapper::DEFAULT_IMG_URL - elsif orig_value !~ %r{\Ahttps?://} + elsif orig_value.length == 62 || orig_value.length == 32 MovieWrapper.construct_image_url(orig_value) else orig_value From 616557cc2caf497ae89a8058c9eb514db69b8299 Mon Sep 17 00:00:00 2001 From: Sigrid Benezra Date: Thu, 20 Dec 2018 11:02:35 -0800 Subject: [PATCH 14/14] Adjust ruby version in gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2d53ba9c..d963ecfa 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.1' +ruby '~> 2.5' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'