Branches- Kristy and Sara

.ruby-version

@@ -0,0 +1 @@
+2.5.5

Gemfile.lock

@@ -197,4 +197,4 @@ RUBY VERSION
    ruby 2.5.5p157
 
 BUNDLED WITH
-   1.17.3
+   2.0.2

app/controllers/movies_controller.rb

@@ -15,14 +15,38 @@ def show
     render(
       status: :ok,
       json: @movie.as_json(
-        only: [:title, :overview, :release_date, :inventory],
+        only: [:title, :overview, :release_date, :inventory, :image_url],
         methods: [:available_inventory]
         )
       )
   end
 
+  def create
+    movie = Movie.new(movie_params)
+    movie.inventory = 1
+    if movie.save
+      render json: {
+        key: movie.id,
+
+      }, status: :ok
+      return
+    else
+      render json: {
+        ok: false,
+        errors: movie.errors.messages
+      }, 
+      status: :bad_request
+      return
+    end
+
+  end
+
   private
 
+  def movie_params
+    params.permit(:title, :overview, :release_date, :image_url, :external_id)
+  end
+
   def require_movie
     @movie = Movie.find_by(title: params[:title])
     unless @movie

app/controllers/rentals_controller.rb

@@ -3,6 +3,20 @@ class RentalsController < ApplicationController
   before_action :require_customer, only: [:check_out, :check_in]
 
   # TODO: make sure that wave 2 works all the way
+  def index
+    rentals = Rental.where(returned: false).map do |rental|
+      {
+          movie: rental.movie,
+          customer: rental.customer,
+          due_date: rental.due_date
+      }
+    end
+    render status: :ok, json: rentals
+  end
+
+
+
+
   def check_out
     rental = Rental.new(movie: @movie, customer: @customer, due_date: params[:due_date])
 

app/models/customer.rb

@@ -1,8 +1,9 @@
 class Customer < ApplicationRecord
   has_many :rentals
   has_many :movies, through: :rentals
-
+  
   def movies_checked_out_count
     self.rentals.where(returned: false).length
   end
+
 end

app/models/rental.rb

@@ -18,6 +18,7 @@ def self.overdue
     self.where(returned: false).where("due_date < ?", Date.today)
   end
 
+
 private
   def due_date_in_future
     return unless self.due_date

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"
+  get "/rentals", to: "rentals#index"
 
   root 'movies#index'