From d96cc209524b0f6fa182da4ce3c7a3ab14257c3c Mon Sep 17 00:00:00 2001
From: Kelsey McAlpine <kmcalpine023@gmail.com>
Date: Tue, 13 Jun 2017 15:34:35 -0700
Subject: [PATCH 1/8] Testing

---
 Gemfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index d5c7affd..a9cba7a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,6 @@
+# rana are we on the same branch?
+
+
 source 'https://rubygems.org'
 
 git_source(:github) do |repo_name|

From 11c9b62d86543fae78eed3582486217f61d94dbb Mon Sep 17 00:00:00 2001
From: Kelsey McAlpine <kmcalpine023@gmail.com>
Date: Wed, 14 Jun 2017 17:06:24 -0700
Subject: [PATCH 2/8] Added ENV

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2012f5a3..05f85b5d 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,9 @@ Search The Movies DB for movies matching the query
   Minimum fields to return:
   - `title`
   - `release_date`
-<!-- 
+
+
+<!--
 ## Other Notes
 Note that this is functionality that was built into the original API
 ### Query Parameters

From a4a3a352ede7e8bfd87ef3c4032d4e7934ccee18 Mon Sep 17 00:00:00 2001
From: Rana Sulaiman <rs_sulaiman@hotmail.com>
Date: Fri, 16 Jun 2017 10:02:13 -0700
Subject: [PATCH 3/8] Added create method to movie_controller and updated the
 routes

---
 Gemfile                              |  2 ++
 Gemfile.lock                         |  2 ++
 app/controllers/movies_controller.rb | 16 ++++++++++++++++
 config/application.rb                | 10 ++++++----
 config/routes.rb                     |  3 ++-
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index a9cba7a4..71d1074f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,6 +40,8 @@ gem 'jbuilder', '~> 2.5'
 
 gem 'will_paginate'
 
+gem 'rack-cors', :require => 'rack/cors'
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platform: :mri
diff --git a/Gemfile.lock b/Gemfile.lock
index b39604fa..f80bcea9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -119,6 +119,7 @@ GEM
       pry (>= 0.9.10)
     puma (3.6.2)
     rack (2.0.1)
+    rack-cors (0.4.1)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.1)
@@ -208,6 +209,7 @@ DEPENDENCIES
   minitest-spec-rails
   pry-rails
   puma (~> 3.0)
+  rack-cors
   rails (~> 5.0.1)
   sass-rails (~> 5.0)
   spring
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
index 362e2791..c2f60ab8 100644
--- a/app/controllers/movies_controller.rb
+++ b/app/controllers/movies_controller.rb
@@ -21,6 +21,22 @@ def show
       )
   end
 
+  def create
+    movie_data = {
+      title: movie_params[:title],
+      overview: movie_params[:overview],
+      release_date: movie_params[:release_date],
+      image_url: movie_params[:image_url][31..-1]
+    }
+
+    movie = Movie.new(movie_data)
+    existing_movie = Movie.find_by(title: params[:title], release_date: params[:release_date])
+    if existing_movie.nil?
+    movie.save
+    end
+  end
+
+
   private
 
   def require_movie
diff --git a/config/application.rb b/config/application.rb
index 2ac21a62..9f8a6f91 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -15,9 +15,11 @@ class Application < Rails::Application
     #this loads everything in the lib folder automatically
     config.eager_load_paths << Rails.root.join('lib')
 
-    config.action_dispatch.default_headers = {
-      'Access-Control-Allow-Origin' => 'http://localhost:8081',
-      'Access-Control-Request-Method' => %w{GET POST OPTIONS}.join(",")
-    }
+    config.middleware.insert_before 0, Rack::Cors do
+      allow do
+        origins '*'
+        resource '*', :headers => :any, :methods => [:get, :post, :put, :delete, :options]
+      end
+    end
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 54bf033e..3f57ac95 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,11 +3,12 @@
 
   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"
   get "/rentals/overdue", to: "rentals#overdue", as: "overdue"
 
 
+
 end

From ed0d396a73cb070e37bf94dcccc74b568f14002b Mon Sep 17 00:00:00 2001
From: Rana Sulaiman <rs_sulaiman@hotmail.com>
Date: Mon, 19 Jun 2017 10:35:27 -0700
Subject: [PATCH 4/8] Fixd create method, so post a new movie is working now

---
 app/controllers/movies_controller.rb | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
index c2f60ab8..b2957f90 100644
--- a/app/controllers/movies_controller.rb
+++ b/app/controllers/movies_controller.rb
@@ -23,17 +23,23 @@ def show
 
   def create
     movie_data = {
-      title: movie_params[:title],
-      overview: movie_params[:overview],
-      release_date: movie_params[:release_date],
-      image_url: movie_params[:image_url][31..-1]
+      title: params[:title],
+      overview: params[:overview],
+      release_date: params[:release_date],
+      image_url: params[:image_url]#[31..-1]
     }
 
+    # puts movie_data
+
     movie = Movie.new(movie_data)
     existing_movie = Movie.find_by(title: params[:title], release_date: params[:release_date])
-    if existing_movie.nil?
-    movie.save
-    end
+    # if existing_movie.nil?
+      if movie.save
+        render status: :ok, json: movie
+      else
+      render status: :error
+      end
+    # end
   end
 
 

From 82b736b447d943324f58d77298c87a9dad6a95b3 Mon Sep 17 00:00:00 2001
From: Rana Sulaiman <rs_sulaiman@hotmail.com>
Date: Mon, 19 Jun 2017 10:45:28 -0700
Subject: [PATCH 5/8] just for pulling

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2012f5a3..05f85b5d 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,9 @@ Search The Movies DB for movies matching the query
   Minimum fields to return:
   - `title`
   - `release_date`
-<!-- 
+
+
+<!--
 ## Other Notes
 Note that this is functionality that was built into the original API
 ### Query Parameters

From a1d53bdface04b2ab995e5d84784a33416a3e8fe Mon Sep 17 00:00:00 2001
From: Rana Sulaiman <rs_sulaiman@hotmail.com>
Date: Mon, 19 Jun 2017 13:18:39 -0700
Subject: [PATCH 6/8] Create to post a new moview is working

---
 app/controllers/movies_controller.rb | 35 ++++++++++++++--------------
 app/models/movie.rb                  |  3 +++
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
index b2957f90..5d1663f4 100644
--- a/app/controllers/movies_controller.rb
+++ b/app/controllers/movies_controller.rb
@@ -22,29 +22,30 @@ def show
   end
 
   def create
-    movie_data = {
-      title: params[:title],
-      overview: params[:overview],
-      release_date: params[:release_date],
-      image_url: params[:image_url]#[31..-1]
-    }
-
-    # puts movie_data
-
-    movie = Movie.new(movie_data)
-    existing_movie = Movie.find_by(title: params[:title], release_date: params[:release_date])
-    # if existing_movie.nil?
-      if movie.save
+    # movie_data = {
+    #   title: params[:title],
+    #   overview: params[:overview],
+    #   release_date: params[:release_date],
+    #   image_url: params[:image_url]#[31..-1]
+    # }
+
+    movie = Movie.new(movie_params)
+
+    if movie.save
+      # if Movie.find_by(title: params[:title], release_date: params[:release_date])
         render status: :ok, json: movie
-      else
-      render status: :error
-      end
-    # end
+    else
+      render status: :error, json: {errors: movie.errors.messages}
+    end
   end
 
 
   private
 
+  def movie_params
+    params.permit(:title, :overview, :release_date, :image_url)
+  end
+
   def require_movie
     @movie = Movie.find_by(title: params[:title])
     unless @movie
diff --git a/app/models/movie.rb b/app/models/movie.rb
index 0327a4d6..beb4ffc9 100644
--- a/app/models/movie.rb
+++ b/app/models/movie.rb
@@ -1,6 +1,9 @@
 class Movie < ApplicationRecord
   attr_accessor :external_id
 
+  validates :title, presence: true
+  # validates :release_date, presence: true
+
   has_many :rentals
   has_many :customers, through: :rentals
 

From d8d8adb960f89fa339cf2a10f7f8761bb3ce64bb Mon Sep 17 00:00:00 2001
From: Kelsey McAlpine <kmcalpine023@gmail.com>
Date: Mon, 19 Jun 2017 13:58:01 -0700
Subject: [PATCH 7/8] Updated create method for movie

---
 app/controllers/movies_controller.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
index 5d1663f4..145ad387 100644
--- a/app/controllers/movies_controller.rb
+++ b/app/controllers/movies_controller.rb
@@ -22,12 +22,12 @@ def show
   end
 
   def create
-    # movie_data = {
-    #   title: params[:title],
-    #   overview: params[:overview],
-    #   release_date: params[:release_date],
-    #   image_url: params[:image_url]#[31..-1]
-    # }
+    movie_params = {
+      title: params[:title],
+      overview: params[:overview],
+      release_date: params[:release_date],
+      image_url: params[:image_url][31..-1]
+    }
 
     movie = Movie.new(movie_params)
 

From 95297751277d4f3016fc0608f39a505627341323 Mon Sep 17 00:00:00 2001
From: Rana Sulaiman <rs_sulaiman@hotmail.com>
Date: Tue, 20 Jun 2017 16:32:45 -0700
Subject: [PATCH 8/8] Fixed a bug

---
 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 beb4ffc9..addb6c4f 100644
--- a/app/models/movie.rb
+++ b/app/models/movie.rb
@@ -8,7 +8,7 @@ class Movie < ApplicationRecord
   has_many :customers, through: :rentals
 
   def available_inventory
-    self.inventory - Rental.where(movie: self, returned: false).length
+    self.inventory =  Rental.where(movie: self, returned: false).length
   end
 
   def image_url