From a51abd7c7d84e6e911f240cfcc13d117af50cf73 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Mon, 5 Mar 2018 14:00:14 -0800
Subject: [PATCH 01/16] front_desk_spec.rb

---
 lib/front_desk.rb         |  0
 lib/reservation.rb        |  0
 lib/room.rb               |  0
 specs/front_desk_spec.rb  | 80 +++++++++++++++++++++++++++++++++++++++
 specs/reservation_spec.rb |  0
 specs/room_spec.rb        |  0
 specs/spec_helper.rb      |  0
 7 files changed, 80 insertions(+)
 create mode 100644 lib/front_desk.rb
 create mode 100644 lib/reservation.rb
 create mode 100644 lib/room.rb
 create mode 100644 specs/front_desk_spec.rb
 create mode 100644 specs/reservation_spec.rb
 create mode 100644 specs/room_spec.rb
 create mode 100644 specs/spec_helper.rb

diff --git a/lib/front_desk.rb b/lib/front_desk.rb
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/reservation.rb b/lib/reservation.rb
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/room.rb b/lib/room.rb
new file mode 100644
index 000000000..e69de29bb
diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
new file mode 100644
index 000000000..2efe58fec
--- /dev/null
+++ b/specs/front_desk_spec.rb
@@ -0,0 +1,80 @@
+require_relative 'spec_helper'
+
+describe "FrontDesk class" do
+  describe "Initializer" do
+    it "is an instance of FrontDesk" do
+      front_desk = Hotel::FrontDesk.new
+      front_desk.must_be_kind_of Hotel::FrontDesk
+    end
+
+    it "establishes the base data structures when instantiated" do
+      front_desk = Hotel::FrontDesk.new
+      [:rooms, :reservations].each do |prop|
+        front_desk.must_respond_to prop
+      end
+
+      front_desk.rooms.must_be_kind_of Array
+      front_desk.reservations.must_be_kind_of Array
+    end
+  end
+
+  describe "find_room method" do
+    before do
+      @front_desk = Hotel::FrontDesk.new
+    end
+
+    it "throws an argument error for a bad ID" do
+      proc{ @front_desk.find_room(0) }.must_raise ArgumentError
+    end
+
+    it "finds a room instance" do
+      room = @front_desk.find_room(2)
+      room.must_be_kind_of Hotel::Room
+    end
+  end
+
+  describe "find_reservation method" do
+    before do
+      @front_desk = Hotel::FrontDesk.new
+    end
+
+    it "throws an argument error for a bad ID" do
+      proc{ @front_desk.find_reservation(0) }.must_raise ArgumentError
+    end
+
+    it "finds a reservation instance" do
+      passenger = @front_desk.find_reservation(2)
+      passenger.must_be_kind_of RideShare::Passenger
+    end
+  end
+
+  describe "loader methods" do
+    it "accurately loads room information into roomss array" do
+      front_desk = Hotel::FrontDesk.new
+
+      first_room = front_desk.rooms.first
+      last_room = front_desk.rooms.last
+
+
+      first_room.id.must_equal 1
+
+      last_room.id.must_equal 20
+    end
+
+    it "accurately loads reservation info and associates reservationss with rooms" do
+      front_desk = Hotel::FrontDesk.new
+
+      reservation = front_desk.reservationss.first
+      room = reservations.room
+
+      room.must_be_instance_of Hotel::FrontDes
+      room.reservations.must_include reservation
+
+
+      reservation.start_date.must_be_instance_of Date
+      reservation.end_date.must_be_instance_of Date
+
+    end
+  end
+
+end
diff --git a/specs/reservation_spec.rb b/specs/reservation_spec.rb
new file mode 100644
index 000000000..e69de29bb
diff --git a/specs/room_spec.rb b/specs/room_spec.rb
new file mode 100644
index 000000000..e69de29bb
diff --git a/specs/spec_helper.rb b/specs/spec_helper.rb
new file mode 100644
index 000000000..e69de29bb

From 8033702126d5d9751c3e2e2d0475cb5073037188 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Mon, 5 Mar 2018 14:35:37 -0800
Subject: [PATCH 02/16] reservation_spec

---
 specs/front_desk_spec.rb  |  9 +++----
 specs/reservation_spec.rb | 56 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index 2efe58fec..97b3f391d 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -49,7 +49,7 @@
   end
 
   describe "loader methods" do
-    it "accurately loads room information into roomss array" do
+    it "accurately loads room information into rooms array" do
       front_desk = Hotel::FrontDesk.new
 
       first_room = front_desk.rooms.first
@@ -61,16 +61,15 @@
       last_room.id.must_equal 20
     end
 
-    it "accurately loads reservation info and associates reservationss with rooms" do
+    it "accurately loads reservation info and associates reservations with rooms" do
       front_desk = Hotel::FrontDesk.new
 
-      reservation = front_desk.reservationss.first
+      reservation = front_desk.reservations.first
       room = reservations.room
 
-      room.must_be_instance_of Hotel::FrontDes
+      room.must_be_instance_of Hotel::FrontDesk
       room.reservations.must_include reservation
 
-
       reservation.start_date.must_be_instance_of Date
       reservation.end_date.must_be_instance_of Date
 
diff --git a/specs/reservation_spec.rb b/specs/reservation_spec.rb
index e69de29bb..97feb85ff 100644
--- a/specs/reservation_spec.rb
+++ b/specs/reservation_spec.rb
@@ -0,0 +1,56 @@
+require_relative 'spec_helper'
+
+  describe "Reservation class" do
+
+    before do
+      start_date = Date.parse('2015-05-20T12:14:00+00:00')
+      end_Date = start_date + 5 # 5 days after start date
+      @reservation_data = {
+        id: 8,
+        room: Hotel::Room.new(id: 3)
+        start_date: start_date,
+        end_date: end_date,
+        cost: 23.45
+      }
+      @reservation = Hotel::Reservation.new(@reservation_data)
+    end
+
+      describe "initialize" do
+
+        it "is an instance of Reservation" do
+          @reservation.must_be_kind_of Hotel::Reservation
+        end
+
+        it "stores an instance of room" do
+          @reservation.room.must_be_kind_of Hotel::Reservation
+        end
+
+        it "raises an error if the end date is before the start date" do
+
+          start_date = Date.parse('2016-01-13T13:28:00+00:00')
+          end_date = Date.parse('2016-01-13T13:16:00+00:00')
+
+          reservation_data = {
+            id: 8,
+            room: Hotel::Room.new(id: 3)
+            start_date: start_date,
+            end_date: end_date,
+            cost: 23.45
+          }
+
+          proc {Hotel::Reservation.new(reservation_data)}.must_raise ArgumentError
+
+        end
+      end
+
+      describe "The Duration Method" do
+        it "calculates the duration of a reservation in days" do
+
+          reservation_length = @reservation.duration
+          reservation_length.must_be_kind_of Float
+          # Convert 25 min to sec
+          reservation_length.must_equal 1500.0
+
+        end
+      end
+    end

From 13ecf1b5b7fb9ed89bf9e8495547305f5d10df00 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Mon, 5 Mar 2018 15:10:23 -0800
Subject: [PATCH 03/16] room_spec

---
 specs/room_spec.rb | 88 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/specs/room_spec.rb b/specs/room_spec.rb
index e69de29bb..b7715f9f9 100644
--- a/specs/room_spec.rb
+++ b/specs/room_spec.rb
@@ -0,0 +1,88 @@
+require_relative 'spec_helper'
+
+describe "Room class" do
+
+  describe "Room instantiation" do
+    before do
+      @room = Hotel::Room.new(id: 1)
+    end
+
+    it "is an instance of Room" do
+      @room.must_be_kind_of Hotel::Room
+    end
+
+    it "throws an argument error with a bad ID value" do
+      proc{ Hotel::Room.new(id: 0))}.must_raise ArgumentError
+    end
+
+    it "sets reservations to an empty array if not provided" do
+      @room.reservationss.must_be_kind_of Array
+      @room.reservationss.length.must_equal 0
+    end
+
+    it "is set up for specific attributes and data types" do
+      [:id].each do |prop|
+        @room.must_respond_to prop
+      end
+
+      # [:id, :status].each do |prop|
+      #   @room.must_respond_to prop
+      # end
+
+      @room.id.must_be_kind_of Integer
+      # @room.status.must_be_kind_of Symbol
+    end
+  end
+
+  describe "add reservation method" do
+    before do
+      @room = Hotel::Room.new(id: 3)
+      @reservation = Hotel::Reservation.new({id: 8, room: @room, start_date: "2015-05-20T12:14:00+00:00", end_date:"2015-05-20T12:19:00+00:00"})
+    end
+
+    it "throws an argument error if reservation is not provided" do
+      proc{ @room.add_reservation(1) }.must_raise ArgumentError
+    end
+
+    it "increases the reservation count by one" do
+      previous = @room.reservations.length
+      @room.add_reservation(@reservation)
+      @room.reservations.length.must_equal previous + 1
+    end
+  end
+
+  before do
+    @room = Hotel::Room.new(id: 5)
+
+    reservation = RideShare::Reservation.new({id: 8, room: @room, guest: nil, start_date: "2015-05-20T12:14:00+00:00", end_date: "2015-05-20T12:19:00+00:00", cost: 18.49})
+    @room.add_reservation(reservation)
+  end
+
+  describe "total_revenue method" do
+
+    it "returns a float" do
+      @room.total_revenue.must_be_kind_of Float
+    end
+
+    it "returns total revenue" do
+      @room.total_revenue.must_equal 13.47
+
+    end
+
+  end
+
+  describe "average_revenue method" do
+
+    it "returns a float" do
+      @room.average_revenue.must_be_kind_of Float
+    end
+
+    it "returns average revenue" do
+      @room.total_revenue.must_equal 13.47
+
+    end
+
+  end
+
+
+end

From bd5529793db217d9e1ba451d14202824c96fcc8c Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Tue, 6 Mar 2018 15:26:39 -0800
Subject: [PATCH 04/16] wave 1 stuff

---
 Rakefile                  |   9 ++++
 lib/front_desk.rb         |  84 +++++++++++++++++++++++++++++
 lib/reservation.rb        |  34 ++++++++++++
 lib/room.rb               |  47 ++++++++++++++++
 specs/front_desk_spec.rb  |  55 ++++++++++---------
 specs/reservation_spec.rb | 109 +++++++++++++++++++-------------------
 specs/room_spec.rb        |  58 ++++++++++----------
 specs/spec_helper.rb      |  20 +++++++
 8 files changed, 305 insertions(+), 111 deletions(-)
 create mode 100644 Rakefile

diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000000000..deb52f2cd
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,9 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs = ["lib"]
+  t.warning = true
+  t.test_files = FileList['specs/*_spec.rb']
+end
+
+task default: :test
diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index e69de29bb..34f123175 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -0,0 +1,84 @@
+require 'date'
+
+require_relative 'room'
+require_relative 'reservation'
+
+module Hotel
+  class FrontDesk
+    attr_reader :rooms, :reservations
+
+    def initialize
+      @rooms = load_rooms
+      @reservations = []
+      # @reservations = load_reservations
+    end
+
+    def load_rooms
+      all_rooms = []
+
+      20.times do |i|
+        all_rooms << Hotel::Room.new(id: i + 1)
+      end
+
+      p "+++TEST+++"
+      p all_rooms
+
+      return all_rooms
+    end
+
+    def find_room(id)
+      check_id(id)
+      @rooms.find{ |room| room.id == id }
+    end
+
+
+    def load_reservations
+      reservations = []
+      reservation = Reservation.new
+      room.add_reservation(reservation)
+      reservations << reservation
+
+
+      reservations
+    end
+
+    def generate_available_rooms
+      available_rooms = @rooms.find_all { |room| room.id == id}
+      return available_rooms
+    end
+
+    def first_available_room
+      first_available_room = generate_available_rooms.first
+    end
+
+    def request_reservation
+      room = first_available_room
+
+      reservation_data = {
+        id: reservations.length + 1,
+        room: room,
+        start_date: DateTime.now,
+        end_date: DateTime.now + 5,
+        cost: reservations.cost
+      }
+
+      new_reservation = Reservation.new(reservation_data)
+
+      room.add_reservation(new_reservation)
+
+      reservations << new_reservation
+      return new_reservation
+
+    end
+
+
+
+    private
+
+    def check_id(id)
+      if id == nil || id <= 0
+        raise ArgumentError.new("ID cannot be blank or less than zero. (got #{id})")
+      end
+    end
+  end
+end
diff --git a/lib/reservation.rb b/lib/reservation.rb
index e69de29bb..b3a31b785 100644
--- a/lib/reservation.rb
+++ b/lib/reservation.rb
@@ -0,0 +1,34 @@
+# require 'csv'
+
+RATE_PER_NIGHT = 200
+
+module Hotel
+  class Reservation
+    attr_reader :id, :room, :start_date, :end_date, :cost, :duration
+
+    def initialize(input)
+      @id = input[:id]
+      @room = input[:room]
+      @start_date = (input[:start_date])
+      @end_date = (input[:end_date])
+      @cost = input[:cost]
+
+      if @end_date < @start_date
+
+        raise ArgumentError.new("Start date must be before end date.")
+
+      end
+    end
+
+    def cost
+      cost = RATE_PER_NIGHT * (duration - 1)
+      return cost
+    end
+
+    def duration
+      duration = @end_date - @start_date
+      return duration
+    end
+
+  end
+end
diff --git a/lib/room.rb b/lib/room.rb
index e69de29bb..09d816602 100644
--- a/lib/room.rb
+++ b/lib/room.rb
@@ -0,0 +1,47 @@
+# require 'csv'
+require_relative 'reservation'
+
+module Hotel
+  class Room
+    attr_reader :id, :status, :reservations
+
+    def initialize(input)
+      if input[:id] == nil || input[:id] <= 0
+        raise ArgumentError.new("ID cannot be blank or less than zero. (got #{input[:id]})")
+      end
+
+      @id = input[:id]
+      # @status = input[:status] == nil ? :AVAILABLE : input[:status]
+
+      @reservations = input[:reservations] == nil ? [] : input[:reservations]
+    end
+
+    def add_reservation(reservation)
+      if reservation.class != Reservation
+        raise ArgumentError.new("Can only add reservation instance to reservation collection")
+      end
+
+      @reservations << reservation
+
+    end
+
+    # DRIVERS_CUT = 0.80
+    # FEE = 1.65
+    #
+    # def total_revenue
+    #   total_revenue = 0
+    #   @trips.each { |trip|
+    #     total_revenue += DRIVERS_CUT * (trip.cost - FEE) }
+    #   return total_revenue.round(2)
+    # end
+    #
+    # def average_revenue
+    #   average_revenue = total_revenue / @trips.length
+    #   return average_revenue
+    # end
+    #
+    # def change_to_unavailable
+    #   @status = :UNAVAILABLE
+    # end
+  end
+end
diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index 97b3f391d..285865317 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -33,20 +33,20 @@
     end
   end
 
-  describe "find_reservation method" do
-    before do
-      @front_desk = Hotel::FrontDesk.new
-    end
-
-    it "throws an argument error for a bad ID" do
-      proc{ @front_desk.find_reservation(0) }.must_raise ArgumentError
-    end
-
-    it "finds a reservation instance" do
-      passenger = @front_desk.find_reservation(2)
-      passenger.must_be_kind_of RideShare::Passenger
-    end
-  end
+  # describe "find_reservation method" do
+  #   before do
+  #     @front_desk = Hotel::FrontDesk.new
+  #   end
+  #
+  #   it "throws an argument error for a bad ID" do
+  #     proc{ @front_desk.find_reservation(0) }.must_raise ArgumentError
+  #   end
+  #
+  #   it "finds a reservation instance" do
+  #     passenger = @front_desk.find_reservation(2)
+  #     passenger.must_be_kind_of RideShare::Passenger
+  #   end
+  # end
 
   describe "loader methods" do
     it "accurately loads room information into rooms array" do
@@ -55,25 +55,24 @@
       first_room = front_desk.rooms.first
       last_room = front_desk.rooms.last
 
-
       first_room.id.must_equal 1
 
       last_room.id.must_equal 20
     end
 
-    it "accurately loads reservation info and associates reservations with rooms" do
-      front_desk = Hotel::FrontDesk.new
-
-      reservation = front_desk.reservations.first
-      room = reservations.room
-
-      room.must_be_instance_of Hotel::FrontDesk
-      room.reservations.must_include reservation
-
-      reservation.start_date.must_be_instance_of Date
-      reservation.end_date.must_be_instance_of Date
-
-    end
+    # it "accurately loads reservation info and associates reservations with rooms" do
+    #   front_desk = Hotel::FrontDesk.new
+    #
+    #   reservation = front_desk.reservations.first
+    #   room = reservation.room
+    #
+    #   room.must_be_instance_of Hotel::FrontDesk
+    #   room.reservations.must_include reservation
+    #
+    #   reservation.start_date.must_be_instance_of Date
+    #   reservation.end_date.must_be_instance_of Date
+    #
+    # end
   end
 
 end
diff --git a/specs/reservation_spec.rb b/specs/reservation_spec.rb
index 97feb85ff..49c2178b3 100644
--- a/specs/reservation_spec.rb
+++ b/specs/reservation_spec.rb
@@ -1,56 +1,57 @@
 require_relative 'spec_helper'
 
-  describe "Reservation class" do
-
-    before do
-      start_date = Date.parse('2015-05-20T12:14:00+00:00')
-      end_Date = start_date + 5 # 5 days after start date
-      @reservation_data = {
-        id: 8,
-        room: Hotel::Room.new(id: 3)
-        start_date: start_date,
-        end_date: end_date,
-        cost: 23.45
-      }
-      @reservation = Hotel::Reservation.new(@reservation_data)
-    end
-
-      describe "initialize" do
-
-        it "is an instance of Reservation" do
-          @reservation.must_be_kind_of Hotel::Reservation
-        end
-
-        it "stores an instance of room" do
-          @reservation.room.must_be_kind_of Hotel::Reservation
-        end
-
-        it "raises an error if the end date is before the start date" do
-
-          start_date = Date.parse('2016-01-13T13:28:00+00:00')
-          end_date = Date.parse('2016-01-13T13:16:00+00:00')
-
-          reservation_data = {
-            id: 8,
-            room: Hotel::Room.new(id: 3)
-            start_date: start_date,
-            end_date: end_date,
-            cost: 23.45
-          }
-
-          proc {Hotel::Reservation.new(reservation_data)}.must_raise ArgumentError
-
-        end
-      end
-
-      describe "The Duration Method" do
-        it "calculates the duration of a reservation in days" do
-
-          reservation_length = @reservation.duration
-          reservation_length.must_be_kind_of Float
-          # Convert 25 min to sec
-          reservation_length.must_equal 1500.0
-
-        end
-      end
-    end
+describe "Reservation class" do
+
+  before do
+    # start_date = Date.parse('2015-05-20T12:14:00+00:00')
+    # end_date = start_date + 5 # 5 days after start date
+    @reservation_data = {
+      id: 8,
+      room: Hotel::Room.new(id: 3),
+      start_date: 20,
+      end_date: 25,
+      cost: 23.45
+    }
+    @reservation = Hotel::Reservation.new(@reservation_data)
+  end
+
+  # describe "initialize" do
+  #
+  #   it "is an instance of Reservation" do
+  #     @reservation.must_be_kind_of Hotel::Reservation
+  #   end
+  #
+  #   it "stores an instance of room" do
+  #     @reservation.room.must_be_kind_of Hotel::Room
+  #   end
+  #
+  #   it "raises an error if the end date is before the start date" do
+  #
+  #     start_date = Date.parse('2016-01-13T13:28:00+00:00')
+  #     end_date = Date.parse('2016-01-13T13:16:00+00:00')
+  #
+  #     reservation_data = {
+  #       id: 8,
+  #       room: Hotel::Room.new(id: 3)
+  #       start_date: start_date,
+  #       end_date: end_date,
+  #       cost: 23.45
+  #     }
+  #
+  #     proc {Hotel::Reservation.new(reservation_data)}.must_raise ArgumentError
+  #   end
+  #
+  # end
+
+  # describe "The Duration Method" do
+  #   it "calculates the duration of a reservation in days" do
+  #
+  #     reservation_length = @reservation.duration
+  #     reservation_length.must_be_kind_of Integer
+  #     # Convert 25 min to sec
+  #     reservation_length.must_equal 5
+  #
+  #   end
+  # end
+
+end
diff --git a/specs/room_spec.rb b/specs/room_spec.rb
index b7715f9f9..df252d980 100644
--- a/specs/room_spec.rb
+++ b/specs/room_spec.rb
@@ -12,12 +12,12 @@
     end
 
     it "throws an argument error with a bad ID value" do
-      proc{ Hotel::Room.new(id: 0))}.must_raise ArgumentError
+      proc{ Hotel::Room.new(id: 0)}.must_raise ArgumentError
     end
 
     it "sets reservations to an empty array if not provided" do
-      @room.reservationss.must_be_kind_of Array
-      @room.reservationss.length.must_equal 0
+      @room.reservations.must_be_kind_of Array
+      @room.reservations.length.must_equal 0
     end
 
     it "is set up for specific attributes and data types" do
@@ -54,35 +54,35 @@
   before do
     @room = Hotel::Room.new(id: 5)
 
-    reservation = RideShare::Reservation.new({id: 8, room: @room, guest: nil, start_date: "2015-05-20T12:14:00+00:00", end_date: "2015-05-20T12:19:00+00:00", cost: 18.49})
+    reservation = Hotel::Reservation.new({id: 8, room: @room, guest: nil, start_date: "2015-05-20T12:14:00+00:00", end_date: "2015-05-20T12:19:00+00:00", cost: 18.49})
     @room.add_reservation(reservation)
   end
 
-  describe "total_revenue method" do
-
-    it "returns a float" do
-      @room.total_revenue.must_be_kind_of Float
-    end
-
-    it "returns total revenue" do
-      @room.total_revenue.must_equal 13.47
-
-    end
-
-  end
-
-  describe "average_revenue method" do
-
-    it "returns a float" do
-      @room.average_revenue.must_be_kind_of Float
-    end
-
-    it "returns average revenue" do
-      @room.total_revenue.must_equal 13.47
-
-    end
-
-  end
+  # describe "total_revenue method" do
+  #
+  #   it "returns a float" do
+  #     @room.total_revenue.must_be_kind_of Float
+  #   end
+  #
+  #   it "returns total revenue" do
+  #     @room.total_revenue.must_equal 13.47
+  #
+  #   end
+  #
+  # end
+  #
+  # describe "average_revenue method" do
+  #
+  #   it "returns a float" do
+  #     @room.average_revenue.must_be_kind_of Float
+  #   end
+  #
+  #   it "returns average revenue" do
+  #     @room.total_revenue.must_equal 13.47
+  #
+  #   end
+  #
+  # end
 
 
 end
diff --git a/specs/spec_helper.rb b/specs/spec_helper.rb
index e69de29bb..a70e38b3d 100644
--- a/specs/spec_helper.rb
+++ b/specs/spec_helper.rb
@@ -0,0 +1,20 @@
+# require 'simplecov'
+# SimpleCov.start
+
+require 'simplecov'
+SimpleCov.start
+
+require 'time'
+require 'date'
+
+require 'minitest'
+require 'minitest/autorun'
+require 'minitest/reporters'
+
+
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+
+# Require_relative your lib files here!
+require_relative '../lib/front_desk'
+require_relative '../lib/room'
+require_relative '../lib/reservation'

From 9173cc938ce4fdd5f156ee7701f91f1d4d3f2e19 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Tue, 6 Mar 2018 17:09:33 -0800
Subject: [PATCH 05/16] wave 1 stuff again

---
 lib/front_desk.rb         |  17 ++-----
 lib/reservation.rb        |  13 +++--
 lib/room.rb               |  19 +------
 specs/front_desk_spec.rb  |  40 +++++----------
 specs/reservation_spec.rb | 104 ++++++++++++++++++++++----------------
 specs/room_spec.rb        |  31 +-----------
 specs/spec_helper.rb      |   2 +
 7 files changed, 88 insertions(+), 138 deletions(-)

diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index 34f123175..e9cc158a1 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -20,8 +20,8 @@ def load_rooms
         all_rooms << Hotel::Room.new(id: i + 1)
       end
 
-      p "+++TEST+++"
-      p all_rooms
+      # p "+++TEST+++"
+      # p all_rooms
 
       return all_rooms
     end
@@ -31,17 +31,6 @@ def find_room(id)
       @rooms.find{ |room| room.id == id }
     end
 
-
-    def load_reservations
-      reservations = []
-      reservation = Reservation.new
-      room.add_reservation(reservation)
-      reservations << reservation
-
-
-      reservations
-    end
-
     def generate_available_rooms
       available_rooms = @rooms.find_all { |room| room.id == id}
       return available_rooms
@@ -49,6 +38,7 @@ def generate_available_rooms
 
     def first_available_room
       first_available_room = generate_available_rooms.first
+      return first_available_room
     end
 
     def request_reservation
@@ -72,7 +62,6 @@ def request_reservation
     end
 
 
-
     private
 
     def check_id(id)
diff --git a/lib/reservation.rb b/lib/reservation.rb
index b3a31b785..005d47c9b 100644
--- a/lib/reservation.rb
+++ b/lib/reservation.rb
@@ -1,8 +1,9 @@
 # require 'csv'
 
-RATE_PER_NIGHT = 200
 
 module Hotel
+  RATE_PER_NIGHT = 200
+
   class Reservation
     attr_reader :id, :room, :start_date, :end_date, :cost, :duration
 
@@ -11,23 +12,21 @@ def initialize(input)
       @room = input[:room]
       @start_date = (input[:start_date])
       @end_date = (input[:end_date])
-      @cost = input[:cost]
+      @cost = calculate_cost
 
       if @end_date < @start_date
-
         raise ArgumentError.new("Start date must be before end date.")
-
       end
     end
 
-    def cost
+    def calculate_cost
       cost = RATE_PER_NIGHT * (duration - 1)
       return cost
     end
 
     def duration
-      duration = @end_date - @start_date
-      return duration
+      duration = @end_date.to_date - @start_date.to_date
+      return duration.to_i
     end
 
   end
diff --git a/lib/room.rb b/lib/room.rb
index 09d816602..2feea4694 100644
--- a/lib/room.rb
+++ b/lib/room.rb
@@ -25,23 +25,6 @@ def add_reservation(reservation)
 
     end
 
-    # DRIVERS_CUT = 0.80
-    # FEE = 1.65
-    #
-    # def total_revenue
-    #   total_revenue = 0
-    #   @trips.each { |trip|
-    #     total_revenue += DRIVERS_CUT * (trip.cost - FEE) }
-    #   return total_revenue.round(2)
-    # end
-    #
-    # def average_revenue
-    #   average_revenue = total_revenue / @trips.length
-    #   return average_revenue
-    # end
-    #
-    # def change_to_unavailable
-    #   @status = :UNAVAILABLE
-    # end
+  
   end
 end
diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index 285865317..5462604cf 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -33,20 +33,6 @@
     end
   end
 
-  # describe "find_reservation method" do
-  #   before do
-  #     @front_desk = Hotel::FrontDesk.new
-  #   end
-  #
-  #   it "throws an argument error for a bad ID" do
-  #     proc{ @front_desk.find_reservation(0) }.must_raise ArgumentError
-  #   end
-  #
-  #   it "finds a reservation instance" do
-  #     passenger = @front_desk.find_reservation(2)
-  #     passenger.must_be_kind_of RideShare::Passenger
-  #   end
-  # end
 
   describe "loader methods" do
     it "accurately loads room information into rooms array" do
@@ -60,19 +46,19 @@
       last_room.id.must_equal 20
     end
 
-    # it "accurately loads reservation info and associates reservations with rooms" do
-    #   front_desk = Hotel::FrontDesk.new
-    #
-    #   reservation = front_desk.reservations.first
-    #   room = reservation.room
-    #
-    #   room.must_be_instance_of Hotel::FrontDesk
-    #   room.reservations.must_include reservation
-    #
-    #   reservation.start_date.must_be_instance_of Date
-    #   reservation.end_date.must_be_instance_of Date
-    #
-    # end
+    it "accurately loads reservation info and associates reservations with rooms" do
+      front_desk = Hotel::FrontDesk.new
+
+      reservation = front_desk.reservations.first
+      # room = reservation.room
+
+      # room.must_be_instance_of Hotel::FrontDesk
+      # room.reservations.must_include reservation
+      #
+      # reservation.start_date.must_be_instance_of Date
+      # reservation.end_date.must_be_instance_of Date
+
+    end
   end
 
 end
diff --git a/specs/reservation_spec.rb b/specs/reservation_spec.rb
index 49c2178b3..fa082687f 100644
--- a/specs/reservation_spec.rb
+++ b/specs/reservation_spec.rb
@@ -3,55 +3,73 @@
 describe "Reservation class" do
 
   before do
-    # start_date = Date.parse('2015-05-20T12:14:00+00:00')
-    # end_date = start_date + 5 # 5 days after start date
+    start_date = Date.parse('2015-05-20T12:14:00+00:00')
+    end_date = start_date + 5 # 5 days after start date
+
     @reservation_data = {
       id: 8,
       room: Hotel::Room.new(id: 3),
-      start_date: 20,
-      end_date: 25,
-      cost: 23.45
+      start_date: start_date,
+      end_date: end_date,
     }
+
     @reservation = Hotel::Reservation.new(@reservation_data)
+    # binding.pry
+
+  end
+
+
+  describe "initialize" do
+    #
+    it "is an instance of Reservation" do
+      @reservation.must_be_kind_of Hotel::Reservation
+    end
+    #
+    it "stores an instance of room" do
+      @reservation.room.must_be_kind_of Hotel::Room
+    end
+    #
+    before do
+      start_date = Date.parse('2015-05-20T12:14:00+00:00')
+      end_date = start_date - 5 # 5 days before start date
+
+      @reservation_data = {
+        id: 8,
+        room: Hotel::Room.new(id: 3),
+        start_date: start_date,
+        end_date: end_date,
+      }
+
+    end
+
+    it "raises an error if the end date is before the start date" do
+
+      proc {Hotel::Reservation.new(@reservation_data)}.must_raise ArgumentError
+    end
+    #
+  end
+
+  describe "The Calculate Cost Method" do
+    it "calculates the cost of a reservation" do
+
+      reservation_cost = @reservation.calculate_cost
+      reservation_cost.must_be_kind_of Integer
+      # Cost is 200 * (5 days - 1) aka 4 nights
+      reservation_cost.must_equal 800
+
+    end
   end
 
-  # describe "initialize" do
-  #
-  #   it "is an instance of Reservation" do
-  #     @reservation.must_be_kind_of Hotel::Reservation
-  #   end
-  #
-  #   it "stores an instance of room" do
-  #     @reservation.room.must_be_kind_of Hotel::Room
-  #   end
-  #
-  #   it "raises an error if the end date is before the start date" do
-  #
-  #     start_date = Date.parse('2016-01-13T13:28:00+00:00')
-  #     end_date = Date.parse('2016-01-13T13:16:00+00:00')
-  #
-  #     reservation_data = {
-  #       id: 8,
-  #       room: Hotel::Room.new(id: 3)
-  #       start_date: start_date,
-  #       end_date: end_date,
-  #       cost: 23.45
-  #     }
-  #
-  #     proc {Hotel::Reservation.new(reservation_data)}.must_raise ArgumentError
-  #   end
-  #
-  # end
-
-  # describe "The Duration Method" do
-  #   it "calculates the duration of a reservation in days" do
-  #
-  #     reservation_length = @reservation.duration
-  #     reservation_length.must_be_kind_of Integer
-  #     # Convert 25 min to sec
-  #     reservation_length.must_equal 5
-  #
-  #   end
-  # end
+  describe "The Duration Method" do
+    it "calculates the duration of a reservation in days" do
+
+      reservation_length = @reservation.duration
+
+      reservation_length.must_be_kind_of Integer
+      # 5 days long
+      reservation_length.must_equal 5
+
+    end
+  end
 
 end
diff --git a/specs/room_spec.rb b/specs/room_spec.rb
index df252d980..411f29e9c 100644
--- a/specs/room_spec.rb
+++ b/specs/room_spec.rb
@@ -37,7 +37,7 @@
   describe "add reservation method" do
     before do
       @room = Hotel::Room.new(id: 3)
-      @reservation = Hotel::Reservation.new({id: 8, room: @room, start_date: "2015-05-20T12:14:00+00:00", end_date:"2015-05-20T12:19:00+00:00"})
+      @reservation = Hotel::Reservation.new({id: 8, room: @room, start_date: Date.parse("2015-05-20T12:14:00+00:00"), end_date: Date.parse("2015-05-20T12:19:00+00:00")})
     end
 
     it "throws an argument error if reservation is not provided" do
@@ -54,35 +54,8 @@
   before do
     @room = Hotel::Room.new(id: 5)
 
-    reservation = Hotel::Reservation.new({id: 8, room: @room, guest: nil, start_date: "2015-05-20T12:14:00+00:00", end_date: "2015-05-20T12:19:00+00:00", cost: 18.49})
+    reservation = Hotel::Reservation.new({id: 8, room: @room, guest: nil, start_date: Date.parse("2015-05-20T12:14:00+00:00"), end_date: Date.parse("2015-05-20T12:19:00+00:00"), cost: 18.49})
     @room.add_reservation(reservation)
   end
 
-  # describe "total_revenue method" do
-  #
-  #   it "returns a float" do
-  #     @room.total_revenue.must_be_kind_of Float
-  #   end
-  #
-  #   it "returns total revenue" do
-  #     @room.total_revenue.must_equal 13.47
-  #
-  #   end
-  #
-  # end
-  #
-  # describe "average_revenue method" do
-  #
-  #   it "returns a float" do
-  #     @room.average_revenue.must_be_kind_of Float
-  #   end
-  #
-  #   it "returns average revenue" do
-  #     @room.total_revenue.must_equal 13.47
-  #
-  #   end
-  #
-  # end
-
-
 end
diff --git a/specs/spec_helper.rb b/specs/spec_helper.rb
index a70e38b3d..1a57d3d3d 100644
--- a/specs/spec_helper.rb
+++ b/specs/spec_helper.rb
@@ -7,6 +7,8 @@
 require 'time'
 require 'date'
 
+require 'pry'
+
 require 'minitest'
 require 'minitest/autorun'
 require 'minitest/reporters'

From 05ada07f7f5a9619178dde3414623eba682a09d0 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Wed, 7 Mar 2018 13:19:33 -0800
Subject: [PATCH 06/16] wave 1, compare reserve dates to available dates

---
 lib/front_desk.rb         | 31 +++++++++++++++++++++----------
 lib/reservation.rb        |  6 ++++--
 specs/front_desk_spec.rb  | 28 ++++++++++++++++++++--------
 specs/reservation_spec.rb |  4 ++--
 specs/room_spec.rb        |  8 +-------
 specs/spec_helper.rb      |  2 +-
 6 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index e9cc158a1..843beb2d2 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -20,9 +20,6 @@ def load_rooms
         all_rooms << Hotel::Room.new(id: i + 1)
       end
 
-      # p "+++TEST+++"
-      # p all_rooms
-
       return all_rooms
     end
 
@@ -32,7 +29,7 @@ def find_room(id)
     end
 
     def generate_available_rooms
-      available_rooms = @rooms.find_all { |room| room.id == id}
+      available_rooms = @rooms
       return available_rooms
     end
 
@@ -41,26 +38,40 @@ def first_available_room
       return first_available_room
     end
 
-    def request_reservation
+    def reserve_room(start_date, end_date)
       room = first_available_room
 
       reservation_data = {
         id: reservations.length + 1,
         room: room,
-        start_date: DateTime.now,
-        end_date: DateTime.now + 5,
-        cost: reservations.cost
+        start_date: start_date,
+        end_date: end_date,
       }
 
       new_reservation = Reservation.new(reservation_data)
 
       room.add_reservation(new_reservation)
-
-      reservations << new_reservation
+      @reservations << new_reservation
       return new_reservation
 
     end
 
+    def get_reservation_list(date)
+      if reservations.length != 0
+        reservation_list = reservations.select { |reservation| compare_dates(reservation, date)}
+        return reservation_list
+      else
+        return []
+      end
+    end
+
+    def compare_dates(reservation, date)
+      start_date = reservations.start_date
+      end_date = reservations.end_date
+
+      return ((date <=> start_date) == -1) && ((end_date <=> date) == -1) ? false : true
+
+    end
 
     private
 
diff --git a/lib/reservation.rb b/lib/reservation.rb
index 005d47c9b..807290b06 100644
--- a/lib/reservation.rb
+++ b/lib/reservation.rb
@@ -25,8 +25,10 @@ def calculate_cost
     end
 
     def duration
-      duration = @end_date.to_date - @start_date.to_date
-      return duration.to_i
+      duration = @end_date - @start_date
+      # Convert Rational to Integer
+      duration = duration.to_i
+      return duration
     end
 
   end
diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index 5462604cf..d33dbec47 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -45,19 +45,31 @@
 
       last_room.id.must_equal 20
     end
+  end
+
+  describe "reserve_room method" do
+    it "reserves a room if available" do
+      front_desk = Hotel::FrontDesk.new
+      # first_available_room = front_desk.rooms.first
+      # make this in to hash later below
+      start_date = Date.new(2018, 03, 06)
+      end_date = Date.new(2018, 03, 11)
+
+      # front_desk.reservations.first.must_be_instance_of Hotel::Reservation
+      front_desk.reserve_room(start_date, end_date)
+    end
 
-    it "accurately loads reservation info and associates reservations with rooms" do
+    it "adds new reservation to reservations array" do
       front_desk = Hotel::FrontDesk.new
 
-      reservation = front_desk.reservations.first
-      # room = reservation.room
+      start_date = Date.new(2018, 03, 06)
+      end_date = start_date + 5 
 
-      # room.must_be_instance_of Hotel::FrontDesk
-      # room.reservations.must_include reservation
-      #
-      # reservation.start_date.must_be_instance_of Date
-      # reservation.end_date.must_be_instance_of Date
+      initial_length = front_desk.reservations.length
+      front_desk.reserve_room(start_date, end_date)
+      new_length = front_desk.reservations.length
 
+      new_length.must_equal initial_length + 1
     end
   end
 
diff --git a/specs/reservation_spec.rb b/specs/reservation_spec.rb
index fa082687f..ed2cb62ba 100644
--- a/specs/reservation_spec.rb
+++ b/specs/reservation_spec.rb
@@ -3,7 +3,7 @@
 describe "Reservation class" do
 
   before do
-    start_date = Date.parse('2015-05-20T12:14:00+00:00')
+    start_date = Date.new(2018, 03, 06)
     end_date = start_date + 5 # 5 days after start date
 
     @reservation_data = {
@@ -30,7 +30,7 @@
     end
     #
     before do
-      start_date = Date.parse('2015-05-20T12:14:00+00:00')
+      start_date = Date.new(2018, 03, 06)
       end_date = start_date - 5 # 5 days before start date
 
       @reservation_data = {
diff --git a/specs/room_spec.rb b/specs/room_spec.rb
index 411f29e9c..3b172b058 100644
--- a/specs/room_spec.rb
+++ b/specs/room_spec.rb
@@ -37,7 +37,7 @@
   describe "add reservation method" do
     before do
       @room = Hotel::Room.new(id: 3)
-      @reservation = Hotel::Reservation.new({id: 8, room: @room, start_date: Date.parse("2015-05-20T12:14:00+00:00"), end_date: Date.parse("2015-05-20T12:19:00+00:00")})
+      @reservation = Hotel::Reservation.new({id: 8, room: @room, start_date: Date.new(2018, 03, 06), end_date: Date.new(2018, 03, 11)})
     end
 
     it "throws an argument error if reservation is not provided" do
@@ -51,11 +51,5 @@
     end
   end
 
-  before do
-    @room = Hotel::Room.new(id: 5)
-
-    reservation = Hotel::Reservation.new({id: 8, room: @room, guest: nil, start_date: Date.parse("2015-05-20T12:14:00+00:00"), end_date: Date.parse("2015-05-20T12:19:00+00:00"), cost: 18.49})
-    @room.add_reservation(reservation)
-  end
 
 end
diff --git a/specs/spec_helper.rb b/specs/spec_helper.rb
index 1a57d3d3d..a9be4f801 100644
--- a/specs/spec_helper.rb
+++ b/specs/spec_helper.rb
@@ -4,10 +4,10 @@
 require 'simplecov'
 SimpleCov.start
 
-require 'time'
 require 'date'
 
 require 'pry'
+require 'awesome_print'
 
 require 'minitest'
 require 'minitest/autorun'

From c3eab53ae42b1650a553f31849a18eff2dc171b9 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Wed, 7 Mar 2018 16:03:46 -0800
Subject: [PATCH 07/16] compare_date_requested method

---
 lib/front_desk.rb | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index 843beb2d2..c15d56302 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -56,20 +56,12 @@ def reserve_room(start_date, end_date)
 
     end
 
-    def get_reservation_list(date)
-      if reservations.length != 0
-        reservation_list = reservations.select { |reservation| compare_dates(reservation, date)}
-        return reservation_list
-      else
-        return []
-      end
-    end
-
-    def compare_dates(reservation, date)
-      start_date = reservations.start_date
-      end_date = reservations.end_date
 
-      return ((date <=> start_date) == -1) && ((end_date <=> date) == -1) ? false : true
+    def compare_date_requested(start_date, end_date, specified_date)
+      #Range is from checkin to checkout day (not including checkout day!)
+      range = (start_date..(end_date - 1))
+      #returns true ONLY for below
+      range.include?(specified_date)
 
     end
 

From a6fa5c84ed9674171beea13ba83f0a58a0f1453e Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Wed, 7 Mar 2018 17:12:53 -0800
Subject: [PATCH 08/16] wave 1 done

---
 specs/front_desk_spec.rb | 91 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 85 insertions(+), 6 deletions(-)

diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index d33dbec47..66a2d2ab4 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -42,7 +42,6 @@
       last_room = front_desk.rooms.last
 
       first_room.id.must_equal 1
-
       last_room.id.must_equal 20
     end
   end
@@ -50,20 +49,18 @@
   describe "reserve_room method" do
     it "reserves a room if available" do
       front_desk = Hotel::FrontDesk.new
-      # first_available_room = front_desk.rooms.first
-      # make this in to hash later below
+
       start_date = Date.new(2018, 03, 06)
       end_date = Date.new(2018, 03, 11)
 
-      # front_desk.reservations.first.must_be_instance_of Hotel::Reservation
-      front_desk.reserve_room(start_date, end_date)
+      front_desk.reserve_room(start_date, end_date).must_be_instance_of Hotel::Reservation
     end
 
     it "adds new reservation to reservations array" do
       front_desk = Hotel::FrontDesk.new
 
       start_date = Date.new(2018, 03, 06)
-      end_date = start_date + 5 
+      end_date = start_date + 5
 
       initial_length = front_desk.reservations.length
       front_desk.reserve_room(start_date, end_date)
@@ -73,4 +70,86 @@
     end
   end
 
+  describe "list_reservations method" do
+
+    it "returns true if date specified has reservations" do
+      front_desk = Hotel::FrontDesk.new
+
+      start_date = Date.new(2018, 03, 06)
+      end_date = start_date + 5
+
+      specified_date = Date.new(2018, 03, 06)
+
+      front_desk.reserve_room(start_date, end_date)
+
+      front_desk.compare_date_requested(start_date, end_date, specified_date).must_equal true
+
+    end
+
+    it "returns false if date specified has no reservations" do
+      front_desk = Hotel::FrontDesk.new
+
+      start_date = Date.new(2018, 03, 06)
+      end_date = start_date + 5
+
+      specified_date = Date.new(2019, 03, 06)
+
+      front_desk.reserve_room(start_date, end_date)
+
+      front_desk.compare_date_requested(start_date, end_date, specified_date).must_equal false
+    end
+
+    it "returns false if date specified is a checkout date" do
+      front_desk = Hotel::FrontDesk.new
+
+      start_date = Date.new(2018, 03, 06)
+      end_date = start_date + 5
+
+      specified_date = end_date
+
+      front_desk.reserve_room(start_date, end_date)
+
+      front_desk.compare_date_requested(start_date, end_date, specified_date).must_equal false
+
+    end
+
+    it "lists the reservations if they exist" do
+      front_desk = Hotel::FrontDesk.new
+
+      start_date = Date.new(2018, 03, 06)
+      end_date = start_date + 5
+
+      specified_date = Date.new(2018, 03, 06)
+
+      front_desk.reserve_room(start_date, end_date)
+      some_var  = front_desk.get_reservation_list(specified_date)
+
+      some_var.must_be_kind_of Array
+      some_var.first.must_be_instance_of Hotel::Reservation
+
+    end
+
+    it "tests multiple reservations for same date" do
+      front_desk = Hotel::FrontDesk.new
+
+      start_date = Date.new(2018, 03, 06)
+      end_date = start_date + 5
+      front_desk.reserve_room(start_date, end_date)
+
+
+      start_date = Date.new(2018, 03, 07)
+      end_date = start_date + 5
+
+      front_desk.reserve_room(start_date, end_date)
+
+      specified_date = Date.new(2018, 03, 07)
+
+      some_var  = front_desk.get_reservation_list(specified_date)
+
+      some_var.length.must_equal 2
+
+    end
+
+  end
+  
 end

From 5ca335b15e758d52aab8f3d02a3ec6ea4986fdc1 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Thu, 8 Mar 2018 10:05:23 -0800
Subject: [PATCH 09/16] get_available_rooms method

---
 lib/front_desk.rb | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index c15d56302..650ccc3fb 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -15,11 +15,9 @@ def initialize
 
     def load_rooms
       all_rooms = []
-
       20.times do |i|
         all_rooms << Hotel::Room.new(id: i + 1)
       end
-
       return all_rooms
     end
 
@@ -28,19 +26,35 @@ def find_room(id)
       @rooms.find{ |room| room.id == id }
     end
 
-    def generate_available_rooms
-      available_rooms = @rooms
+
+    def availability_by_date_range(start_date, end_date)
+      occupied_rooms = []
+      range = (start_date...end_date)
+
+
+      @reservations.each do |reservation|
+        if (range.include? reservation.start_date) || (range.include? reservation.end_date - 1)
+          occupied_rooms << reservation.room
+        end
+      end
+
+      available_rooms = []
+      @rooms.each do |room|
+        if !occupied_rooms.include? room
+          available_rooms << room
+        end
+      end
       return available_rooms
+
     end
 
-    def first_available_room
-      first_available_room = generate_available_rooms.first
+    def first_available_room(start_date, end_date)
+      first_available_room = availability_by_date_range(start_date, end_date).first
       return first_available_room
     end
 
     def reserve_room(start_date, end_date)
-      room = first_available_room
-
+      room = first_available_room(start_date, end_date)
       reservation_data = {
         id: reservations.length + 1,
         room: room,
@@ -52,16 +66,19 @@ def reserve_room(start_date, end_date)
 
       room.add_reservation(new_reservation)
       @reservations << new_reservation
+      # binding.pry
       return new_reservation
 
     end
 
-
-    def compare_date_requested(start_date, end_date, specified_date)
-      #Range is from checkin to checkout day (not including checkout day!)
-      range = (start_date..(end_date - 1))
-      #returns true ONLY for below
-      range.include?(specified_date)
+    def get_reservation_list(specified_date)
+      reservations_on_date = []
+      @reservations.each do |reservation|
+        if reservation.date_range.include? specified_date
+          reservations_on_date  << reservation
+        end
+      end
+      return reservations_on_date
 
     end
 

From f7a20319305180fe242bbe600a738b0107abf17b Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Thu, 8 Mar 2018 15:00:10 -0800
Subject: [PATCH 10/16] wave 2, front_desk lib/specs

---
 lib/front_desk.rb        |  24 +++----
 lib/reservation.rb       |   5 ++
 lib/room.rb              |   2 +-
 specs/front_desk_spec.rb | 134 ++++++++++++++++-----------------------
 4 files changed, 72 insertions(+), 93 deletions(-)

diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index 650ccc3fb..420b98e78 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -10,7 +10,11 @@ class FrontDesk
     def initialize
       @rooms = load_rooms
       @reservations = []
-      # @reservations = load_reservations
+    end
+
+    def find_room(id)
+      check_id(id)
+      @rooms.find{ |room| room.id == id }
     end
 
     def load_rooms
@@ -21,26 +25,22 @@ def load_rooms
       return all_rooms
     end
 
-    def find_room(id)
-      check_id(id)
-      @rooms.find{ |room| room.id == id }
-    end
-
-
-    def availability_by_date_range(start_date, end_date)
+    def store_occupied_rooms(start_date, end_date)
       occupied_rooms = []
       range = (start_date...end_date)
 
-
       @reservations.each do |reservation|
         if (range.include? reservation.start_date) || (range.include? reservation.end_date - 1)
           occupied_rooms << reservation.room
         end
       end
+      return occupied_rooms
+    end
 
+    def get_available_rooms(start_date, end_date)
       available_rooms = []
       @rooms.each do |room|
-        if !occupied_rooms.include? room
+        if !store_occupied_rooms(start_date, end_date).include? room
           available_rooms << room
         end
       end
@@ -49,12 +49,13 @@ def availability_by_date_range(start_date, end_date)
     end
 
     def first_available_room(start_date, end_date)
-      first_available_room = availability_by_date_range(start_date, end_date).first
+      first_available_room = get_available_rooms(start_date, end_date).first
       return first_available_room
     end
 
     def reserve_room(start_date, end_date)
       room = first_available_room(start_date, end_date)
+
       reservation_data = {
         id: reservations.length + 1,
         room: room,
@@ -66,7 +67,6 @@ def reserve_room(start_date, end_date)
 
       room.add_reservation(new_reservation)
       @reservations << new_reservation
-      # binding.pry
       return new_reservation
 
     end
diff --git a/lib/reservation.rb b/lib/reservation.rb
index 807290b06..93cb38600 100644
--- a/lib/reservation.rb
+++ b/lib/reservation.rb
@@ -24,6 +24,11 @@ def calculate_cost
       return cost
     end
 
+    def date_range
+      @range = (@start_date..(@end_date - 1))
+      return @range
+    end
+
     def duration
       duration = @end_date - @start_date
       # Convert Rational to Integer
diff --git a/lib/room.rb b/lib/room.rb
index 2feea4694..b9c417520 100644
--- a/lib/room.rb
+++ b/lib/room.rb
@@ -25,6 +25,6 @@ def add_reservation(reservation)
 
     end
 
-  
+
   end
 end
diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index 66a2d2ab4..a6e96a0ef 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -1,27 +1,26 @@
 require_relative 'spec_helper'
 
 describe "FrontDesk class" do
+
+  before do
+    @front_desk = Hotel::FrontDesk.new
+  end
+
   describe "Initializer" do
     it "is an instance of FrontDesk" do
-      front_desk = Hotel::FrontDesk.new
-      front_desk.must_be_kind_of Hotel::FrontDesk
+      @front_desk.must_be_kind_of Hotel::FrontDesk
     end
 
     it "establishes the base data structures when instantiated" do
-      front_desk = Hotel::FrontDesk.new
       [:rooms, :reservations].each do |prop|
-        front_desk.must_respond_to prop
+        @front_desk.must_respond_to prop
       end
-
-      front_desk.rooms.must_be_kind_of Array
-      front_desk.reservations.must_be_kind_of Array
+      @front_desk.rooms.must_be_kind_of Array
+      @front_desk.reservations.must_be_kind_of Array
     end
   end
 
   describe "find_room method" do
-    before do
-      @front_desk = Hotel::FrontDesk.new
-    end
 
     it "throws an argument error for a bad ID" do
       proc{ @front_desk.find_room(0) }.must_raise ArgumentError
@@ -33,99 +32,77 @@
     end
   end
 
-
   describe "loader methods" do
     it "accurately loads room information into rooms array" do
-      front_desk = Hotel::FrontDesk.new
 
-      first_room = front_desk.rooms.first
-      last_room = front_desk.rooms.last
+      first_room = @front_desk.rooms.first
+      last_room = @front_desk.rooms.last
 
       first_room.id.must_equal 1
       last_room.id.must_equal 20
     end
   end
 
-  describe "reserve_room method" do
-    it "reserves a room if available" do
-      front_desk = Hotel::FrontDesk.new
-
-      start_date = Date.new(2018, 03, 06)
-      end_date = Date.new(2018, 03, 11)
-
-      front_desk.reserve_room(start_date, end_date).must_be_instance_of Hotel::Reservation
-    end
-
-    it "adds new reservation to reservations array" do
-      front_desk = Hotel::FrontDesk.new
-
-      start_date = Date.new(2018, 03, 06)
-      end_date = start_date + 5
+  before do
+    @front_desk = Hotel::FrontDesk.new
+    @start_date = Date.new(2018, 03, 06)
+    @end_date = @start_date + 5
+  end
 
-      initial_length = front_desk.reservations.length
-      front_desk.reserve_room(start_date, end_date)
-      new_length = front_desk.reservations.length
+  describe "store_occupied_rooms method" do
+    it "takes reservations and stores them in an occupied array" do
 
-      new_length.must_equal initial_length + 1
     end
   end
 
-  describe "list_reservations method" do
-
-    it "returns true if date specified has reservations" do
-      front_desk = Hotel::FrontDesk.new
-
-      start_date = Date.new(2018, 03, 06)
-      end_date = start_date + 5
-
-      specified_date = Date.new(2018, 03, 06)
-
-      front_desk.reserve_room(start_date, end_date)
-
-      front_desk.compare_date_requested(start_date, end_date, specified_date).must_equal true
+  describe "testing get_available_rooms method" do
 
+    it "returns an array of all available rooms for given range" do
+      @front_desk.reserve_room(@start_date, @end_date)
+      @front_desk.get_available_rooms(@start_date, @end_date).length.must_equal 19
     end
 
-    it "returns false if date specified has no reservations" do
-      front_desk = Hotel::FrontDesk.new
-
-      start_date = Date.new(2018, 03, 06)
-      end_date = start_date + 5
+    it "returns an empty array if no rooms available for a given date range" do
 
-      specified_date = Date.new(2019, 03, 06)
-
-      front_desk.reserve_room(start_date, end_date)
+      20.times do
+        @front_desk.reserve_room(@start_date, @end_date)
+      end
 
-      front_desk.compare_date_requested(start_date, end_date, specified_date).must_equal false
+      @front_desk.get_available_rooms(@start_date, @end_date).must_equal []
+      @front_desk.get_available_rooms(@start_date, @end_date).must_be_empty
     end
+  end
 
-    it "returns false if date specified is a checkout date" do
-      front_desk = Hotel::FrontDesk.new
-
-      start_date = Date.new(2018, 03, 06)
-      end_date = start_date + 5
-
-      specified_date = end_date
 
-      front_desk.reserve_room(start_date, end_date)
+  describe "reserve_room method" do
+    it "reserves a room if available" do
+      @front_desk.reserve_room(@start_date, @end_date).must_be_instance_of Hotel::Reservation
+    end
 
-      front_desk.compare_date_requested(start_date, end_date, specified_date).must_equal false
+    it "adds new reservation to reservations array" do
+      initial_length = @front_desk.reservations.length
+      @front_desk.reserve_room(@start_date, @end_date)
+      new_length = @front_desk.reservations.length
 
+      new_length.must_equal initial_length + 1
     end
+  end
 
-    it "lists the reservations if they exist" do
-      front_desk = Hotel::FrontDesk.new
-
-      start_date = Date.new(2018, 03, 06)
-      end_date = start_date + 5
+  before do
+    @front_desk = Hotel::FrontDesk.new
+    @start_date = Date.new(2018, 03, 06)
+    @end_date = @start_date + 5
+    @specified_date = Date.new(2018, 03, 06)
+  end
 
-      specified_date = Date.new(2018, 03, 06)
+  describe "list_reservations method" do
 
-      front_desk.reserve_room(start_date, end_date)
-      some_var  = front_desk.get_reservation_list(specified_date)
+    it "lists the reservations if they exist" do
+      @front_desk.reserve_room(@start_date, @end_date)
+      reservations_by_date = @front_desk.get_reservation_list(@specified_date)
 
-      some_var.must_be_kind_of Array
-      some_var.first.must_be_instance_of Hotel::Reservation
+      reservations_by_date.must_be_kind_of Array
+      reservations_by_date.first.must_be_instance_of Hotel::Reservation
 
     end
 
@@ -134,8 +111,8 @@
 
       start_date = Date.new(2018, 03, 06)
       end_date = start_date + 5
-      front_desk.reserve_room(start_date, end_date)
 
+      front_desk.reserve_room(start_date, end_date)
 
       start_date = Date.new(2018, 03, 07)
       end_date = start_date + 5
@@ -144,12 +121,9 @@
 
       specified_date = Date.new(2018, 03, 07)
 
-      some_var  = front_desk.get_reservation_list(specified_date)
-
-      some_var.length.must_equal 2
+      reservations_by_date = front_desk.get_reservation_list(specified_date)
 
+      reservations_by_date.length.must_equal 2
     end
-
   end
-  
 end

From bffd728c9365f8691582bbfa58f17fbe58ebe610 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Thu, 8 Mar 2018 16:17:56 -0800
Subject: [PATCH 11/16] wave 2, reservation/reservation_spec

---
 lib/reservation.rb        | 15 ++++++++-------
 specs/reservation_spec.rb | 31 +++++++++++++++++++------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/lib/reservation.rb b/lib/reservation.rb
index 93cb38600..88bb1e710 100644
--- a/lib/reservation.rb
+++ b/lib/reservation.rb
@@ -19,22 +19,23 @@ def initialize(input)
       end
     end
 
-    def calculate_cost
-      cost = RATE_PER_NIGHT * (duration - 1)
-      return cost
-    end
-
     def date_range
-      @range = (@start_date..(@end_date - 1))
+      @range = (@start_date...@end_date)
       return @range
     end
 
     def duration
-      duration = @end_date - @start_date
+      duration = ((@end_date - 1) - @start_date)
       # Convert Rational to Integer
       duration = duration.to_i
       return duration
     end
 
+
+    def calculate_cost
+      cost = RATE_PER_NIGHT * duration
+      return cost
+    end
+
   end
 end
diff --git a/specs/reservation_spec.rb b/specs/reservation_spec.rb
index ed2cb62ba..a82b353fc 100644
--- a/specs/reservation_spec.rb
+++ b/specs/reservation_spec.rb
@@ -49,27 +49,34 @@
     #
   end
 
-  describe "The Calculate Cost Method" do
-    it "calculates the cost of a reservation" do
-
-      reservation_cost = @reservation.calculate_cost
-      reservation_cost.must_be_kind_of Integer
-      # Cost is 200 * (5 days - 1) aka 4 nights
-      reservation_cost.must_equal 800
-
+  describe "The Range Method" do
+    it "calculates the range of a reservation in nights" do
+      reservation_date_range = @reservation.date_range
+      reservation_date_range.must_be_kind_of Range
     end
   end
 
   describe "The Duration Method" do
-    it "calculates the duration of a reservation in days" do
+    it "calculates the duration of a reservation in nights stayed" do
 
       reservation_length = @reservation.duration
-
       reservation_length.must_be_kind_of Integer
-      # 5 days long
-      reservation_length.must_equal 5
+      # 5 days/4 nights long
+      reservation_length.must_equal 4
 
     end
   end
 
+  describe "The Calculate Cost Method" do
+    it "calculates the cost of a reservation" do
+
+      reservation_cost = @reservation.calculate_cost
+      reservation_cost.must_be_kind_of Integer
+      # Cost is 200 * 4 nights
+      reservation_cost.must_equal 800
+
+    end
+  end
+
+
 end

From b991a6f88aab4cf632d9f760609c03a0a04b0783 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Thu, 8 Mar 2018 16:39:45 -0800
Subject: [PATCH 12/16] change room id variable to room_number

---
 lib/front_desk.rb         | 19 ++++++++++---------
 lib/room.rb               |  6 +++---
 specs/front_desk_spec.rb  |  6 +++---
 specs/reservation_spec.rb |  4 ++--
 specs/room_spec.rb        | 12 ++++++------
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index 420b98e78..d604061eb 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -12,19 +12,19 @@ def initialize
       @reservations = []
     end
 
-    def find_room(id)
-      check_id(id)
-      @rooms.find{ |room| room.id == id }
-    end
-
     def load_rooms
       all_rooms = []
       20.times do |i|
-        all_rooms << Hotel::Room.new(id: i + 1)
+        all_rooms << Hotel::Room.new(room_number: i + 1)
       end
       return all_rooms
     end
 
+    def find_room(room_number)
+      check_room_number(room_number)
+      @rooms.find{ |room| room.room_number == room_number }
+    end
+
     def store_occupied_rooms(start_date, end_date)
       occupied_rooms = []
       range = (start_date...end_date)
@@ -67,6 +67,7 @@ def reserve_room(start_date, end_date)
 
       room.add_reservation(new_reservation)
       @reservations << new_reservation
+      binding.pry
       return new_reservation
 
     end
@@ -84,9 +85,9 @@ def get_reservation_list(specified_date)
 
     private
 
-    def check_id(id)
-      if id == nil || id <= 0
-        raise ArgumentError.new("ID cannot be blank or less than zero. (got #{id})")
+    def check_room_number(room_number)
+      if room_number == nil || room_number <= 0
+        raise ArgumentError.new("Room number cannot be blank or less than zero. (got #{room_number})")
       end
     end
   end
diff --git a/lib/room.rb b/lib/room.rb
index b9c417520..049bcbe80 100644
--- a/lib/room.rb
+++ b/lib/room.rb
@@ -3,14 +3,14 @@
 
 module Hotel
   class Room
-    attr_reader :id, :status, :reservations
+    attr_reader :room_number, :status, :reservations
 
     def initialize(input)
-      if input[:id] == nil || input[:id] <= 0
+      if input[:room_number] == nil || input[:room_number] <= 0
         raise ArgumentError.new("ID cannot be blank or less than zero. (got #{input[:id]})")
       end
 
-      @id = input[:id]
+      @room_number = input[:room_number]
       # @status = input[:status] == nil ? :AVAILABLE : input[:status]
 
       @reservations = input[:reservations] == nil ? [] : input[:reservations]
diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index a6e96a0ef..708aa963a 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -22,7 +22,7 @@
 
   describe "find_room method" do
 
-    it "throws an argument error for a bad ID" do
+    it "throws an argument error for a bad room_number" do
       proc{ @front_desk.find_room(0) }.must_raise ArgumentError
     end
 
@@ -38,8 +38,8 @@
       first_room = @front_desk.rooms.first
       last_room = @front_desk.rooms.last
 
-      first_room.id.must_equal 1
-      last_room.id.must_equal 20
+      first_room.room_number.must_equal 1
+      last_room.room_number.must_equal 20
     end
   end
 
diff --git a/specs/reservation_spec.rb b/specs/reservation_spec.rb
index a82b353fc..6fcc8a1c2 100644
--- a/specs/reservation_spec.rb
+++ b/specs/reservation_spec.rb
@@ -8,7 +8,7 @@
 
     @reservation_data = {
       id: 8,
-      room: Hotel::Room.new(id: 3),
+      room: Hotel::Room.new(room_number: 3),
       start_date: start_date,
       end_date: end_date,
     }
@@ -35,7 +35,7 @@
 
       @reservation_data = {
         id: 8,
-        room: Hotel::Room.new(id: 3),
+        room: Hotel::Room.new(room_number: 3),
         start_date: start_date,
         end_date: end_date,
       }
diff --git a/specs/room_spec.rb b/specs/room_spec.rb
index 3b172b058..fe1e99dd6 100644
--- a/specs/room_spec.rb
+++ b/specs/room_spec.rb
@@ -4,7 +4,7 @@
 
   describe "Room instantiation" do
     before do
-      @room = Hotel::Room.new(id: 1)
+      @room = Hotel::Room.new(room_number: 1)
     end
 
     it "is an instance of Room" do
@@ -12,7 +12,7 @@
     end
 
     it "throws an argument error with a bad ID value" do
-      proc{ Hotel::Room.new(id: 0)}.must_raise ArgumentError
+      proc{ Hotel::Room.new(room_number: 0)}.must_raise ArgumentError
     end
 
     it "sets reservations to an empty array if not provided" do
@@ -21,7 +21,7 @@
     end
 
     it "is set up for specific attributes and data types" do
-      [:id].each do |prop|
+      [:room_number].each do |prop|
         @room.must_respond_to prop
       end
 
@@ -29,15 +29,15 @@
       #   @room.must_respond_to prop
       # end
 
-      @room.id.must_be_kind_of Integer
+      @room.room_number.must_be_kind_of Integer
       # @room.status.must_be_kind_of Symbol
     end
   end
 
   describe "add reservation method" do
     before do
-      @room = Hotel::Room.new(id: 3)
-      @reservation = Hotel::Reservation.new({id: 8, room: @room, start_date: Date.new(2018, 03, 06), end_date: Date.new(2018, 03, 11)})
+      @room = Hotel::Room.new(room_number: 3)
+      @reservation = Hotel::Reservation.new({room_number: 8, room: @room, start_date: Date.new(2018, 03, 06), end_date: Date.new(2018, 03, 11)})
     end
 
     it "throws an argument error if reservation is not provided" do

From c310604de05bc70d242a888eea233cc60ff50496 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Sat, 10 Mar 2018 12:00:45 -0800
Subject: [PATCH 13/16] wave 2 complete

---
 lib/front_desk.rb        | 20 ++++++++------------
 lib/reservation.rb       |  4 ++--
 specs/front_desk_spec.rb | 11 ++++++++++-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index d604061eb..94118d90e 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -12,19 +12,18 @@ def initialize
       @reservations = []
     end
 
-    def load_rooms
-      all_rooms = []
-      20.times do |i|
-        all_rooms << Hotel::Room.new(room_number: i + 1)
-      end
-      return all_rooms
-    end
-
     def find_room(room_number)
       check_room_number(room_number)
       @rooms.find{ |room| room.room_number == room_number }
     end
 
+    def load_rooms
+      all_rooms = []
+      20.times{ |room_index|
+        all_rooms << Hotel::Room.new(room_number: room_index + 1) }
+      return all_rooms
+    end
+
     def store_occupied_rooms(start_date, end_date)
       occupied_rooms = []
       range = (start_date...end_date)
@@ -67,9 +66,7 @@ def reserve_room(start_date, end_date)
 
       room.add_reservation(new_reservation)
       @reservations << new_reservation
-      binding.pry
       return new_reservation
-
     end
 
     def get_reservation_list(specified_date)
@@ -80,13 +77,12 @@ def get_reservation_list(specified_date)
         end
       end
       return reservations_on_date
-
     end
 
     private
 
     def check_room_number(room_number)
-      if room_number == nil || room_number <= 0
+      if room_number == nil || room_number < 1 || room_number > 20
         raise ArgumentError.new("Room number cannot be blank or less than zero. (got #{room_number})")
       end
     end
diff --git a/lib/reservation.rb b/lib/reservation.rb
index 88bb1e710..f61e0c7f9 100644
--- a/lib/reservation.rb
+++ b/lib/reservation.rb
@@ -12,7 +12,7 @@ def initialize(input)
       @room = input[:room]
       @start_date = (input[:start_date])
       @end_date = (input[:end_date])
-      @cost = calculate_cost
+      @cost = input[:cost] == nil ? RATE_PER_NIGHT : input[:cost]
 
       if @end_date < @start_date
         raise ArgumentError.new("Start date must be before end date.")
@@ -33,7 +33,7 @@ def duration
 
 
     def calculate_cost
-      cost = RATE_PER_NIGHT * duration
+      cost = @cost * duration
       return cost
     end
 
diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index 708aa963a..094180004 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -26,6 +26,10 @@
       proc{ @front_desk.find_room(0) }.must_raise ArgumentError
     end
 
+    it "throws an argument error for a bad room_number" do
+      proc{ @front_desk.find_room(21) }.must_raise ArgumentError
+    end
+
     it "finds a room instance" do
       room = @front_desk.find_room(2)
       room.must_be_kind_of Hotel::Room
@@ -51,6 +55,12 @@
 
   describe "store_occupied_rooms method" do
     it "takes reservations and stores them in an occupied array" do
+    one_reservation = @front_desk.reserve_room(@start_date, @end_date)
+    
+    occupied_rooms = @front_desk.store_occupied_rooms(@start_date, @end_date)
+
+    occupied_rooms.must_be_kind_of Array
+    occupied_rooms.length.must_equal 1
 
     end
   end
@@ -73,7 +83,6 @@
     end
   end
 
-
   describe "reserve_room method" do
     it "reserves a room if available" do
       @front_desk.reserve_room(@start_date, @end_date).must_be_instance_of Hotel::Reservation

From 7023b0574530677a6a3b8826c62e05a485cb64a1 Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Sat, 10 Mar 2018 18:26:38 -0800
Subject: [PATCH 14/16] add block class, reserve room wtih or without block_id,
 calculate cost with or without discount

---
 lib/block.rb             | 43 +++++++++++++++++++++++++
 lib/front_desk.rb        | 68 ++++++++++++++++++++++++++++++++++------
 lib/reservation.rb       | 13 +++++---
 lib/room.rb              | 12 ++++++-
 specs/front_desk_spec.rb | 65 +++++++++++++++++++++++++++++++-------
 5 files changed, 174 insertions(+), 27 deletions(-)
 create mode 100644 lib/block.rb

diff --git a/lib/block.rb b/lib/block.rb
new file mode 100644
index 000000000..295bd35d3
--- /dev/null
+++ b/lib/block.rb
@@ -0,0 +1,43 @@
+# require 'csv'
+
+
+module Hotel
+
+  class Block
+
+    BLOCK_DISCOUNT = 0.80
+    RATE_PER_NIGHT = 200 * BLOCK_DISCOUNT
+
+    attr_reader :id, :block, :start_date, :end_date, :cost, :duration
+
+    def initialize(input)
+      @id = input[:id]
+      @block = input[:block]
+      @start_date = input[:start_date]
+      @end_date = input[:end_date]
+      @cost = input[:cost] == nil ? RATE_PER_NIGHT : input[:cost]
+
+      if @end_date < @start_date
+        raise ArgumentError.new("Start date must be before end date.")
+      end
+    end
+
+    def date_range
+      @range = (@start_date...@end_date)
+      return @range
+    end
+
+    def duration
+      duration = ((@end_date - 1) - @start_date)
+      # Convert Rational to Integer
+      duration = duration.to_i
+      return duration
+    end
+
+    def calculate_cost
+      cost = @cost * duration
+      return cost
+    end
+
+  end
+end
diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index 94118d90e..396b09561 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -2,14 +2,18 @@
 
 require_relative 'room'
 require_relative 'reservation'
+require_relative 'block'
+
 
 module Hotel
   class FrontDesk
-    attr_reader :rooms, :reservations
+    attr_reader :rooms
+    attr_accessor :reservations, :blocks
 
     def initialize
       @rooms = load_rooms
       @reservations = []
+      @blocks = []
     end
 
     def find_room(room_number)
@@ -19,9 +23,11 @@ def find_room(room_number)
 
     def load_rooms
       all_rooms = []
-      20.times{ |room_index|
-        all_rooms << Hotel::Room.new(room_number: room_index + 1) }
+      20.times do |room_index|
+        all_rooms << Hotel::Room.new(room_number: room_index + 1)
+      end
       return all_rooms
+
     end
 
     def store_occupied_rooms(start_date, end_date)
@@ -37,29 +43,37 @@ def store_occupied_rooms(start_date, end_date)
     end
 
     def get_available_rooms(start_date, end_date)
-      available_rooms = []
+      ####TO-DO if blocked, make unavailable
+      @available_rooms = []
       @rooms.each do |room|
         if !store_occupied_rooms(start_date, end_date).include? room
-          available_rooms << room
+          @available_rooms << room
         end
       end
-      return available_rooms
+
+      return @available_rooms
 
     end
 
+
     def first_available_room(start_date, end_date)
       first_available_room = get_available_rooms(start_date, end_date).first
+      # p "TEST"
+      # p first_available_room
+
       return first_available_room
     end
 
-    def reserve_room(start_date, end_date)
-      room = first_available_room(start_date, end_date)
+    def reserve_room(data)
+      room = first_available_room(data[:start_date], data[:end_date])
 
       reservation_data = {
         id: reservations.length + 1,
+        block_id: data[:block_id],
         room: room,
-        start_date: start_date,
-        end_date: end_date,
+        start_date: data[:start_date],
+        end_date: data[:end_date],
+        # cost: RATE_PER_NIGHT
       }
 
       new_reservation = Reservation.new(reservation_data)
@@ -79,6 +93,40 @@ def get_reservation_list(specified_date)
       return reservations_on_date
     end
 
+    def get_available_blocks(number_of_rooms, start_date, end_date)
+      if number_of_rooms > 5
+        raise ArgumentError.new("Cannot block more than 5 rooms!")
+      end
+
+      # if get_available_rooms(start_date, end_date) < number_of_rooms
+      #   raise ArgumentError.new("There are not enough rooms available for the requested dates")
+      # end
+
+      available_block = (get_available_rooms(start_date, end_date)).take(number_of_rooms)
+      #.take will automatically take first available rooms and return array
+      return available_block
+    end
+
+    def block_rooms(number_of_rooms, start_date, end_date)
+
+      block = get_available_blocks(number_of_rooms, start_date, end_date)
+
+      block_data = {
+        id: @blocks.length + 1,
+        block: block,
+        start_date: start_date,
+        end_date: end_date,
+      }
+
+      new_block = Hotel::Block.new(block_data)
+      p "TEST"
+      p block
+
+      # room.add_block(block_data)
+      @blocks << new_block
+      return new_block
+    end
+
     private
 
     def check_room_number(room_number)
diff --git a/lib/reservation.rb b/lib/reservation.rb
index f61e0c7f9..e59f10c72 100644
--- a/lib/reservation.rb
+++ b/lib/reservation.rb
@@ -3,16 +3,18 @@
 
 module Hotel
   RATE_PER_NIGHT = 200
-
+  BLOCK_DISCOUNT = 0.80
   class Reservation
+
     attr_reader :id, :room, :start_date, :end_date, :cost, :duration
 
     def initialize(input)
       @id = input[:id]
+      @block_id = input[:block_id] == nil ? nil : input[:block_id]
       @room = input[:room]
       @start_date = (input[:start_date])
       @end_date = (input[:end_date])
-      @cost = input[:cost] == nil ? RATE_PER_NIGHT : input[:cost]
+      @cost = calculate_cost
 
       if @end_date < @start_date
         raise ArgumentError.new("Start date must be before end date.")
@@ -31,9 +33,12 @@ def duration
       return duration
     end
 
-
     def calculate_cost
-      cost = @cost * duration
+      if @block_id == nil
+        cost = RATE_PER_NIGHT * duration
+      else
+        cost = (RATE_PER_NIGHT * duration) * BLOCK_DISCOUNT
+      end
       return cost
     end
 
diff --git a/lib/room.rb b/lib/room.rb
index 049bcbe80..3846d16ea 100644
--- a/lib/room.rb
+++ b/lib/room.rb
@@ -25,6 +25,16 @@ def add_reservation(reservation)
 
     end
 
-
+    # def add_block(block)
+    #   # #array of dates between start date and end date
+    #   # block_range = (start_date...end_date)
+    #   # return block_range
+    #
+    #   if block.class != Block
+    #     raise ArgumentError.new("Can only add reservation instance to reservation collection")
+    #   end
+    #
+    #   @blocks << block
+    # end
   end
 end
diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index 094180004..bcb724a33 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -51,23 +51,25 @@
     @front_desk = Hotel::FrontDesk.new
     @start_date = Date.new(2018, 03, 06)
     @end_date = @start_date + 5
+    @data = {start_date: @start_date, end_date: @end_date, }
   end
 
   describe "store_occupied_rooms method" do
     it "takes reservations and stores them in an occupied array" do
-    one_reservation = @front_desk.reserve_room(@start_date, @end_date)
-    
-    occupied_rooms = @front_desk.store_occupied_rooms(@start_date, @end_date)
+      one_reservation = @front_desk.reserve_room(@data)
 
-    occupied_rooms.must_be_kind_of Array
-    occupied_rooms.length.must_equal 1
+      occupied_rooms = @front_desk.store_occupied_rooms(@start_date, @end_date)
+
+      occupied_rooms.must_be_kind_of Array
+      occupied_rooms.length.must_equal 1
 
     end
   end
 
   describe "testing get_available_rooms method" do
-
     it "returns an array of all available rooms for given range" do
+      skip
+
       @front_desk.reserve_room(@start_date, @end_date)
       @front_desk.get_available_rooms(@start_date, @end_date).length.must_equal 19
     end
@@ -75,7 +77,7 @@
     it "returns an empty array if no rooms available for a given date range" do
 
       20.times do
-        @front_desk.reserve_room(@start_date, @end_date)
+        @front_desk.reserve_room(@data)
       end
 
       @front_desk.get_available_rooms(@start_date, @end_date).must_equal []
@@ -85,12 +87,14 @@
 
   describe "reserve_room method" do
     it "reserves a room if available" do
-      @front_desk.reserve_room(@start_date, @end_date).must_be_instance_of Hotel::Reservation
+
+
+      @front_desk.reserve_room(@data).must_be_instance_of Hotel::Reservation
     end
 
     it "adds new reservation to reservations array" do
       initial_length = @front_desk.reservations.length
-      @front_desk.reserve_room(@start_date, @end_date)
+      @front_desk.reserve_room(@data)
       new_length = @front_desk.reservations.length
 
       new_length.must_equal initial_length + 1
@@ -101,13 +105,14 @@
     @front_desk = Hotel::FrontDesk.new
     @start_date = Date.new(2018, 03, 06)
     @end_date = @start_date + 5
+    @data = {start_date: @start_date, end_date: @end_date, }
     @specified_date = Date.new(2018, 03, 06)
   end
 
   describe "list_reservations method" do
 
     it "lists the reservations if they exist" do
-      @front_desk.reserve_room(@start_date, @end_date)
+      @front_desk.reserve_room(@data)
       reservations_by_date = @front_desk.get_reservation_list(@specified_date)
 
       reservations_by_date.must_be_kind_of Array
@@ -121,12 +126,12 @@
       start_date = Date.new(2018, 03, 06)
       end_date = start_date + 5
 
-      front_desk.reserve_room(start_date, end_date)
+      front_desk.reserve_room(@data)
 
       start_date = Date.new(2018, 03, 07)
       end_date = start_date + 5
 
-      front_desk.reserve_room(start_date, end_date)
+      front_desk.reserve_room(@data)
 
       specified_date = Date.new(2018, 03, 07)
 
@@ -135,4 +140,40 @@
       reservations_by_date.length.must_equal 2
     end
   end
+
+
+
+  describe "block_rooms method" do
+
+    before do
+      @front_desk = Hotel::FrontDesk.new
+      @number_of_rooms = 5
+      @start_date = Date.new(2018, 03, 06)
+      @end_date = @start_date + 5
+      @data = {start_date: @start_date, end_date: @end_date, }
+
+    end
+
+    it "blocks rooms if available" do
+      @front_desk.reserve_room(@data)
+      @front_desk.block_rooms(@number_of_rooms, @start_date, @end_date).must_be_instance_of Hotel::Block
+    end
+  end
+
+  describe "add_reservation from bloked room method" do
+    before do
+      @front_desk = Hotel::FrontDesk.new
+      @number_of_rooms = 5
+      @start_date = Date.new(2018, 03, 06)
+      @end_date = @start_date + 5
+      @data = {block_id: 1, start_date: @start_date, end_date: @end_date }
+
+    end
+    it "adds a reservation with a block_id" do
+      @front_desk.block_rooms(@number_of_rooms, @start_date, @end_date)
+      @front_desk.reserve_room(@data)
+
+    end
+  end
+
 end

From f01d64c57f11017c99865b6907630b05b1f4ee7c Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Sat, 10 Mar 2018 19:27:07 -0800
Subject: [PATCH 15/16] rename variables, refactoring

---
 lib/block.rb             | 27 +++-----------------------
 lib/front_desk.rb        | 42 ++++++++++++++--------------------------
 lib/reservation.rb       |  5 +++--
 lib/room.rb              | 16 +--------------
 specs/front_desk_spec.rb |  2 +-
 5 files changed, 23 insertions(+), 69 deletions(-)

diff --git a/lib/block.rb b/lib/block.rb
index 295bd35d3..310ff0167 100644
--- a/lib/block.rb
+++ b/lib/block.rb
@@ -5,39 +5,18 @@ module Hotel
 
   class Block
 
-    BLOCK_DISCOUNT = 0.80
-    RATE_PER_NIGHT = 200 * BLOCK_DISCOUNT
-
-    attr_reader :id, :block, :start_date, :end_date, :cost, :duration
+    attr_reader :block_id, :party, :start_date, :end_date
 
     def initialize(input)
-      @id = input[:id]
-      @block = input[:block]
+      @block_id = input[:block_id]
+      @party = input[:party]
       @start_date = input[:start_date]
       @end_date = input[:end_date]
-      @cost = input[:cost] == nil ? RATE_PER_NIGHT : input[:cost]
 
       if @end_date < @start_date
         raise ArgumentError.new("Start date must be before end date.")
       end
     end
 
-    def date_range
-      @range = (@start_date...@end_date)
-      return @range
-    end
-
-    def duration
-      duration = ((@end_date - 1) - @start_date)
-      # Convert Rational to Integer
-      duration = duration.to_i
-      return duration
-    end
-
-    def calculate_cost
-      cost = @cost * duration
-      return cost
-    end
-
   end
 end
diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index 396b09561..7923243ae 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -7,13 +7,12 @@
 
 module Hotel
   class FrontDesk
-    attr_reader :rooms
-    attr_accessor :reservations, :blocks
+    attr_reader :rooms, :reservations, :blocked_rooms
 
     def initialize
       @rooms = load_rooms
       @reservations = []
-      @blocks = []
+      @blocked_rooms = []
     end
 
     def find_room(room_number)
@@ -43,37 +42,30 @@ def store_occupied_rooms(start_date, end_date)
     end
 
     def get_available_rooms(start_date, end_date)
-      ####TO-DO if blocked, make unavailable
       @available_rooms = []
       @rooms.each do |room|
         if !store_occupied_rooms(start_date, end_date).include? room
           @available_rooms << room
         end
       end
-
       return @available_rooms
-
     end
 
 
     def first_available_room(start_date, end_date)
       first_available_room = get_available_rooms(start_date, end_date).first
-      # p "TEST"
-      # p first_available_room
-
       return first_available_room
     end
 
-    def reserve_room(data)
-      room = first_available_room(data[:start_date], data[:end_date])
+    def reserve_room(input)
+      room = first_available_room(input[:start_date], input[:end_date])
 
       reservation_data = {
-        id: reservations.length + 1,
-        block_id: data[:block_id],
+        reservation_id: reservations.length + 1,
+        block_id: input[:block_id],
         room: room,
-        start_date: data[:start_date],
-        end_date: data[:end_date],
-        # cost: RATE_PER_NIGHT
+        start_date: input[:start_date],
+        end_date: input[:end_date],
       }
 
       new_reservation = Reservation.new(reservation_data)
@@ -93,7 +85,7 @@ def get_reservation_list(specified_date)
       return reservations_on_date
     end
 
-    def get_available_blocks(number_of_rooms, start_date, end_date)
+    def get_available_blocked_rooms(number_of_rooms, start_date, end_date)
       if number_of_rooms > 5
         raise ArgumentError.new("Cannot block more than 5 rooms!")
       end
@@ -103,27 +95,23 @@ def get_available_blocks(number_of_rooms, start_date, end_date)
       # end
 
       available_block = (get_available_rooms(start_date, end_date)).take(number_of_rooms)
-      #.take will automatically take first available rooms and return array
       return available_block
     end
 
     def block_rooms(number_of_rooms, start_date, end_date)
 
-      block = get_available_blocks(number_of_rooms, start_date, end_date)
+      party = get_available_blocked_rooms(number_of_rooms, start_date, end_date)
 
       block_data = {
-        id: @blocks.length + 1,
-        block: block,
+        block_id: @blocked_rooms.length + 1,
+        party: party,
         start_date: start_date,
         end_date: end_date,
       }
 
-      new_block = Hotel::Block.new(block_data)
-      p "TEST"
-      p block
-
-      # room.add_block(block_data)
-      @blocks << new_block
+      new_block = Block.new(block_data)
+    
+      @blocked_rooms << new_block
       return new_block
     end
 
diff --git a/lib/reservation.rb b/lib/reservation.rb
index e59f10c72..66f984d04 100644
--- a/lib/reservation.rb
+++ b/lib/reservation.rb
@@ -4,12 +4,13 @@
 module Hotel
   RATE_PER_NIGHT = 200
   BLOCK_DISCOUNT = 0.80
+  
   class Reservation
 
-    attr_reader :id, :room, :start_date, :end_date, :cost, :duration
+    attr_reader :reservation_id, :room, :start_date, :end_date, :cost, :duration
 
     def initialize(input)
-      @id = input[:id]
+      @reservation_id = input[:reservation_id]
       @block_id = input[:block_id] == nil ? nil : input[:block_id]
       @room = input[:room]
       @start_date = (input[:start_date])
diff --git a/lib/room.rb b/lib/room.rb
index 3846d16ea..35560178a 100644
--- a/lib/room.rb
+++ b/lib/room.rb
@@ -1,9 +1,8 @@
-# require 'csv'
 require_relative 'reservation'
 
 module Hotel
   class Room
-    attr_reader :room_number, :status, :reservations
+    attr_reader :room_number, :reservations
 
     def initialize(input)
       if input[:room_number] == nil || input[:room_number] <= 0
@@ -11,7 +10,6 @@ def initialize(input)
       end
 
       @room_number = input[:room_number]
-      # @status = input[:status] == nil ? :AVAILABLE : input[:status]
 
       @reservations = input[:reservations] == nil ? [] : input[:reservations]
     end
@@ -24,17 +22,5 @@ def add_reservation(reservation)
       @reservations << reservation
 
     end
-
-    # def add_block(block)
-    #   # #array of dates between start date and end date
-    #   # block_range = (start_date...end_date)
-    #   # return block_range
-    #
-    #   if block.class != Block
-    #     raise ArgumentError.new("Can only add reservation instance to reservation collection")
-    #   end
-    #
-    #   @blocks << block
-    # end
   end
 end
diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index bcb724a33..7b06a39e2 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -56,7 +56,7 @@
 
   describe "store_occupied_rooms method" do
     it "takes reservations and stores them in an occupied array" do
-      one_reservation = @front_desk.reserve_room(@data)
+      @front_desk.reserve_room(@data)
 
       occupied_rooms = @front_desk.store_occupied_rooms(@start_date, @end_date)
 

From d0459869fb84ea6fcff9fac2edc8619bbddbdf8d Mon Sep 17 00:00:00 2001
From: Madaleine Shields <maddiev.shields@gmail.com>
Date: Sat, 10 Mar 2018 20:13:01 -0800
Subject: [PATCH 16/16] block_spec

---
 lib/block.rb              |  3 --
 lib/front_desk.rb         |  9 ++++--
 lib/reservation.rb        |  6 ++--
 specs/block_speck.rb      | 46 ++++++++++++++++++++++++++
 specs/front_desk_spec.rb  | 68 ++++++++++++++++++++++++++++-----------
 specs/reservation_spec.rb |  6 ++--
 6 files changed, 107 insertions(+), 31 deletions(-)
 create mode 100644 specs/block_speck.rb

diff --git a/lib/block.rb b/lib/block.rb
index 310ff0167..98e828661 100644
--- a/lib/block.rb
+++ b/lib/block.rb
@@ -1,6 +1,3 @@
-# require 'csv'
-
-
 module Hotel
 
   class Block
diff --git a/lib/front_desk.rb b/lib/front_desk.rb
index 7923243ae..778693c77 100644
--- a/lib/front_desk.rb
+++ b/lib/front_desk.rb
@@ -35,7 +35,7 @@ def store_occupied_rooms(start_date, end_date)
 
       @reservations.each do |reservation|
         if (range.include? reservation.start_date) || (range.include? reservation.end_date - 1)
-          occupied_rooms << reservation.room
+          occupied_rooms << reservation.room_number
         end
       end
       return occupied_rooms
@@ -51,7 +51,6 @@ def get_available_rooms(start_date, end_date)
       return @available_rooms
     end
 
-
     def first_available_room(start_date, end_date)
       first_available_room = get_available_rooms(start_date, end_date).first
       return first_available_room
@@ -72,6 +71,7 @@ def reserve_room(input)
 
       room.add_reservation(new_reservation)
       @reservations << new_reservation
+      p new_reservation
       return new_reservation
     end
 
@@ -95,6 +95,7 @@ def get_available_blocked_rooms(number_of_rooms, start_date, end_date)
       # end
 
       available_block = (get_available_rooms(start_date, end_date)).take(number_of_rooms)
+      # p available_block
       return available_block
     end
 
@@ -110,8 +111,10 @@ def block_rooms(number_of_rooms, start_date, end_date)
       }
 
       new_block = Block.new(block_data)
-    
+
       @blocked_rooms << new_block
+      # p "++++TEST++++"
+      # p @blocked_rooms
       return new_block
     end
 
diff --git a/lib/reservation.rb b/lib/reservation.rb
index 66f984d04..3c70c7b10 100644
--- a/lib/reservation.rb
+++ b/lib/reservation.rb
@@ -4,15 +4,15 @@
 module Hotel
   RATE_PER_NIGHT = 200
   BLOCK_DISCOUNT = 0.80
-  
+
   class Reservation
 
-    attr_reader :reservation_id, :room, :start_date, :end_date, :cost, :duration
+    attr_reader :reservation_id, :room_number, :start_date, :end_date, :cost, :duration
 
     def initialize(input)
       @reservation_id = input[:reservation_id]
       @block_id = input[:block_id] == nil ? nil : input[:block_id]
-      @room = input[:room]
+      @room_number = input[:room_number]
       @start_date = (input[:start_date])
       @end_date = (input[:end_date])
       @cost = calculate_cost
diff --git a/specs/block_speck.rb b/specs/block_speck.rb
new file mode 100644
index 000000000..6be86ec8c
--- /dev/null
+++ b/specs/block_speck.rb
@@ -0,0 +1,46 @@
+require_relative 'spec_helper'
+
+describe "Block class" do
+
+  before do
+    start_date = Date.new(2018, 03, 06)
+    end_date = start_date + 5 # 5 days after start date
+    number_of_rooms = 5
+
+    @block_data = {
+      block_id: 8,
+      party: Hotel::Room.new(room_number: 3),
+      start_date: start_date,
+      end_date: end_date,
+    }
+
+    @block = Hotel::Block.new(@block_data)
+  end
+
+
+  describe "initialize" do
+    it "is an instance of Block" do
+      @block.must_be_kind_of Hotel::Block
+    end
+
+    before do
+      start_date = Date.new(2018, 03, 06)
+      end_date = start_date - 5 # 5 days before start date
+
+      @reservation_data = {
+        block_id: 8,
+        party: Hotel::Room.new(room_number: 3),
+        start_date: start_date,
+        end_date: end_date,
+      }
+    end
+
+    it "raises an error if the end date is before the start date" do
+
+      proc {Hotel::Reservation.new(@reservation_data)}.must_raise ArgumentError
+    end
+    #
+  end
+
+
+end
diff --git a/specs/front_desk_spec.rb b/specs/front_desk_spec.rb
index 7b06a39e2..960885bc2 100644
--- a/specs/front_desk_spec.rb
+++ b/specs/front_desk_spec.rb
@@ -8,10 +8,12 @@
 
   describe "Initializer" do
     it "is an instance of FrontDesk" do
+      skip
       @front_desk.must_be_kind_of Hotel::FrontDesk
     end
 
-    it "establishes the base data structures when instantiated" do
+    it "establishes the base input structures when instantiated" do
+      skip
       [:rooms, :reservations].each do |prop|
         @front_desk.must_respond_to prop
       end
@@ -23,14 +25,17 @@
   describe "find_room method" do
 
     it "throws an argument error for a bad room_number" do
+      skip
       proc{ @front_desk.find_room(0) }.must_raise ArgumentError
     end
 
     it "throws an argument error for a bad room_number" do
+      skip
       proc{ @front_desk.find_room(21) }.must_raise ArgumentError
     end
 
     it "finds a room instance" do
+      skip
       room = @front_desk.find_room(2)
       room.must_be_kind_of Hotel::Room
     end
@@ -38,6 +43,7 @@
 
   describe "loader methods" do
     it "accurately loads room information into rooms array" do
+      skip
 
       first_room = @front_desk.rooms.first
       last_room = @front_desk.rooms.last
@@ -51,12 +57,14 @@
     @front_desk = Hotel::FrontDesk.new
     @start_date = Date.new(2018, 03, 06)
     @end_date = @start_date + 5
-    @data = {start_date: @start_date, end_date: @end_date, }
+    @input = {start_date: @start_date, end_date: @end_date, }
+    @front_desk.reserve_room(@input)
+
   end
 
   describe "store_occupied_rooms method" do
     it "takes reservations and stores them in an occupied array" do
-      @front_desk.reserve_room(@data)
+      skip
 
       occupied_rooms = @front_desk.store_occupied_rooms(@start_date, @end_date)
 
@@ -69,15 +77,15 @@
   describe "testing get_available_rooms method" do
     it "returns an array of all available rooms for given range" do
       skip
-
-      @front_desk.reserve_room(@start_date, @end_date)
+      @front_desk.reserve_room(@input)
       @front_desk.get_available_rooms(@start_date, @end_date).length.must_equal 19
     end
 
     it "returns an empty array if no rooms available for a given date range" do
+      skip
 
       20.times do
-        @front_desk.reserve_room(@data)
+        @front_desk.reserve_room(@input)
       end
 
       @front_desk.get_available_rooms(@start_date, @end_date).must_equal []
@@ -87,14 +95,15 @@
 
   describe "reserve_room method" do
     it "reserves a room if available" do
+      skip
 
-
-      @front_desk.reserve_room(@data).must_be_instance_of Hotel::Reservation
+      @front_desk.reserve_room(@input).must_be_instance_of Hotel::Reservation
     end
 
     it "adds new reservation to reservations array" do
+      skip
       initial_length = @front_desk.reservations.length
-      @front_desk.reserve_room(@data)
+      @front_desk.reserve_room(@input)
       new_length = @front_desk.reservations.length
 
       new_length.must_equal initial_length + 1
@@ -105,14 +114,15 @@
     @front_desk = Hotel::FrontDesk.new
     @start_date = Date.new(2018, 03, 06)
     @end_date = @start_date + 5
-    @data = {start_date: @start_date, end_date: @end_date, }
+    @input = {start_date: @start_date, end_date: @end_date, }
     @specified_date = Date.new(2018, 03, 06)
   end
 
   describe "list_reservations method" do
 
     it "lists the reservations if they exist" do
-      @front_desk.reserve_room(@data)
+      skip
+      @front_desk.reserve_room(@input)
       reservations_by_date = @front_desk.get_reservation_list(@specified_date)
 
       reservations_by_date.must_be_kind_of Array
@@ -121,17 +131,18 @@
     end
 
     it "tests multiple reservations for same date" do
+      skip
       front_desk = Hotel::FrontDesk.new
 
       start_date = Date.new(2018, 03, 06)
       end_date = start_date + 5
 
-      front_desk.reserve_room(@data)
+      front_desk.reserve_room(@input)
 
       start_date = Date.new(2018, 03, 07)
       end_date = start_date + 5
 
-      front_desk.reserve_room(@data)
+      front_desk.reserve_room(@input)
 
       specified_date = Date.new(2018, 03, 07)
 
@@ -150,28 +161,47 @@
       @number_of_rooms = 5
       @start_date = Date.new(2018, 03, 06)
       @end_date = @start_date + 5
-      @data = {start_date: @start_date, end_date: @end_date, }
+      @input = {start_date: @start_date, end_date: @end_date, }
 
     end
 
+    # it "throws an argument error for unavailable number of rooms to block" do
+    #   proc{ @front_desk.block_rooms(0) }.must_raise ArgumentError
+    # end
+
     it "blocks rooms if available" do
-      @front_desk.reserve_room(@data)
+      @front_desk.reserve_room(@input)
       @front_desk.block_rooms(@number_of_rooms, @start_date, @end_date).must_be_instance_of Hotel::Block
     end
   end
 
-  describe "add_reservation from bloked room method" do
+  describe "add_reservation from blocked room method" do
     before do
       @front_desk = Hotel::FrontDesk.new
       @number_of_rooms = 5
       @start_date = Date.new(2018, 03, 06)
       @end_date = @start_date + 5
-      @data = {block_id: 1, start_date: @start_date, end_date: @end_date }
-
+      @input = {block_id: 1, start_date: @start_date, end_date: @end_date }
     end
+
     it "adds a reservation with a block_id" do
       @front_desk.block_rooms(@number_of_rooms, @start_date, @end_date)
-      @front_desk.reserve_room(@data)
+      reserve_room_with_block_id = @front_desk.reserve_room(@input)
+      reserve_room_with_block_id.must_be_instance_of Hotel::Reservation
+    end
+
+    it "adds new block to blocks array" do
+      initial_length = @front_desk.blocked_rooms.length
+      @front_desk.block_rooms(@number_of_rooms, @start_date, @end_date)
+      new_length = @front_desk.blocked_rooms.length
+
+      new_length.must_equal initial_length + 1
+    end
+
+    it "adds a second reservation with a block_id to the next available room in the block" do
+      @front_desk.block_rooms(@number_of_rooms, @start_date, @end_date)
+      @front_desk.reserve_room(@input)
+      @front_desk.reserve_room(@input)
 
     end
   end
diff --git a/specs/reservation_spec.rb b/specs/reservation_spec.rb
index 6fcc8a1c2..34a091104 100644
--- a/specs/reservation_spec.rb
+++ b/specs/reservation_spec.rb
@@ -8,7 +8,7 @@
 
     @reservation_data = {
       id: 8,
-      room: Hotel::Room.new(room_number: 3),
+      room_number: Hotel::Room.new(room_number: 3),
       start_date: start_date,
       end_date: end_date,
     }
@@ -26,7 +26,7 @@
     end
     #
     it "stores an instance of room" do
-      @reservation.room.must_be_kind_of Hotel::Room
+      @reservation.room_number.must_be_kind_of Hotel::Room
     end
     #
     before do
@@ -35,7 +35,7 @@
 
       @reservation_data = {
         id: 8,
-        room: Hotel::Room.new(room_number: 3),
+        room_number: Hotel::Room.new(room_number: 3),
         start_date: start_date,
         end_date: end_date,
       }