Trang & Daniela - RideShare

README.md

@@ -207,7 +207,7 @@ net_expenditures|This method will **override** the cooresponding method in `User
 
 **All the new methods above should have tests**
 
-<!-- # Wave 3
+
 
 Our program needs a way to make new trips and appropriately assign a driver and user.
 
@@ -245,7 +245,7 @@ Your code from waves 1 & 2 should _ignore_ any in-progress trips. That is to say
 
 You should also **add explicit tests** for this new situation. For example, what happens if you attempt to calculate the total money spent for a `User` with an in-progress trip, or the average hourly revenue of a `Driver` with an in-progress trip? -->
 
-<!-- # Wave 4
+Wave 4
 
 We want to evolve `TripDispatcher` so it assigns drivers in more intelligent ways. Every time we make a new trip, we want to pick drivers who haven't completed a trip in a long time, or who have never been assigned a trip.
 

lib/trip.rb

@@ -2,18 +2,22 @@
 
 module RideShare
   class Trip
-    attr_reader :id, :passenger, :start_time, :end_time, :cost, :rating
+    attr_reader :id, :driver, :passenger, :start_time, :end_time, :cost, :rating
 
     def initialize(input)
+      unless input[:end_time] == nil
+        raise ArgumentError.new "Start time must be before end time!" if input[:start_time] >= input[:end_time]
+      end
       @id = input[:id]
+      @driver = input[:driver]
       @passenger = input[:passenger]
       @start_time = input[:start_time]
       @end_time = input[:end_time]
       @cost = input[:cost]
       @rating = input[:rating]
 
-      if @rating > 5 || @rating < 1
-        raise ArgumentError.new("Invalid rating #{@rating}")
+      unless @rating == nil
+        raise ArgumentError.new("Invalid rating #{@rating}") if @rating > 5 || @rating < 1
       end
     end
 
@@ -22,5 +26,10 @@ def inspect
       "ID=#{id.inspect} " +
       "PassengerID=#{passenger&.id.inspect}>"
     end
+
+    def trip_duration
+      return @end_time == nil ? nil : duration = @end_time - @start_time
+    end
+
   end
 end

lib/trip_dispatcher.rb

@@ -1,5 +1,6 @@
 require 'csv'
 require 'time'
+require 'pry'
 
 require_relative 'user'
 require_relative 'trip'
@@ -9,46 +10,71 @@ class TripDispatcher
     attr_reader :drivers, :passengers, :trips
 
     def initialize(user_file = 'support/users.csv',
-                   trip_file = 'support/trips.csv')
+                   trip_file = 'support/trips.csv',
+                   driver_file = 'support/drivers.csv')
       @passengers = load_users(user_file)
+      @drivers = load_drivers(driver_file)
       @trips = load_trips(trip_file)
     end
 
     def load_users(filename)
       users = []
 
       CSV.read(filename, headers: true).each do |line|
-        input_data = {}
-        input_data[:id] = line[0].to_i
-        input_data[:name] = line[1]
-        input_data[:phone] = line[2]
-
-        users << User.new(input_data)
+        users << User.new({:id => line[0].to_i, :name => line[1], :phone => line[2]})
       end
 
       return users
     end
 
+    def load_drivers(filename)
+      drivers = []
+
+      CSV.read(filename, headers: true).each do |line|
+        found_passenger = find_passenger(line[0].to_i)
+
+        new_driver = Driver.new(id: line[0].to_i,
+                                name: found_passenger.name,
+                                phone: found_passenger.phone_number,
+                                vin: line[1],
+                                status: line[2].to_sym,
+                                trips: found_passenger.trips)
+
+        drivers << new_driver
+        @passengers[@passengers.index(found_passenger)] = new_driver
+      end
+
+      return drivers
+    end
+
+    def find_driver(id)
+      check_id(id)
+      return @drivers.find { |driver| driver.id == id }
+    end
 
     def load_trips(filename)
       trips = []
+
       trip_data = CSV.open(filename, 'r', headers: true,
                                           header_converters: :symbol)
 
       trip_data.each do |raw_trip|
         passenger = find_passenger(raw_trip[:passenger_id].to_i)
+        driver = find_driver(raw_trip[:driver_id].to_i)
 
         parsed_trip = {
           id: raw_trip[:id].to_i,
+          driver: driver,
           passenger: passenger,
-          start_time: raw_trip[:start_time],
-          end_time: raw_trip[:end_time],
+          start_time: Time.parse(raw_trip[:start_time]),
+          end_time: Time.parse(raw_trip[:end_time]),
           cost: raw_trip[:cost].to_f,
           rating: raw_trip[:rating].to_i
         }
 
         trip = Trip.new(parsed_trip)
         passenger.add_trip(trip)
+        driver.add_driven_trip(trip)
         trips << trip
       end
 
@@ -67,6 +93,41 @@ def inspect
               #{passengers.count} passengers>"
     end
 
+    def request_trip(user_id)
+      available_drivers = @drivers.select {|driver| driver.status == :AVAILABLE and driver.id != user_id }
+
+      driver = available_drivers.find {|driver| driver.driven_trips.empty?}
+
+      # first find the latest trip end time for each driver, then find the driver associated with the least recent trip end time
+      driver ||= available_drivers.min_by {|driver|
+        latest_trip = driver.driven_trips.max_by {|trip| trip.end_time}
+        latest_trip.end_time}
+
+      raise ArgumentError, 'No drivers available' if driver == nil
+
+      passenger = find_passenger(user_id)
+
+      input = {
+        id: @trips.last.id + 1,
+        driver: driver,
+        passenger: passenger,
+        start_time: Time.now,
+        end_time: nil,
+        cost: nil,
+        rating: nil
+      }
+
+      new_trip = Trip.new(input)
+      @trips << new_trip
+
+      driver.make_unavailable
+      driver.add_driven_trip(new_trip)
+
+      passenger.add_trip(new_trip)
+
+      return new_trip
+    end
+
     private
 
     def check_id(id)

lib/user.rb

@@ -16,5 +16,75 @@ def initialize(input)
     def add_trip(trip)
       @trips << trip
     end
+
+    def net_expenditures
+      total = 0
+      @trips.each do |trip|
+        total += trip.cost unless trip.end_time == nil
+      end
+      return total
+    end
+
+    def total_time_spent
+      total_time = 0
+      @trips.each do |trip|
+        total_time += trip.trip_duration unless trip.end_time == nil
+      end
+      return total_time
+    end
+
+  end
+
+  class Driver < User
+    attr_reader :vehicle_id, :driven_trips, :status, :trips
+
+    def initialize(id: 0, name: "no name", vin: 0, phone: 0, status: :UNAVAILABLE, trips: [])
+      raise ArgumentError.new "ID not valid" if id <= 0
+      raise ArgumentError.new "Invalid VIN" if vin.length != 17
+      raise ArgumentError.new "Invalid status" if status != :AVAILABLE && status != :UNAVAILABLE
+      @id = id
+      @name = name
+      @vehicle_id = vin
+      @phone = phone
+      @status = status
+      @driven_trips = []
+      @trips = trips
+    end
+
+    def average_rating
+      sum = 0
+      in_progress = 0
+
+      @driven_trips.each do |trip|
+        trip.end_time == nil ? in_progress += 1 : sum += trip.rating
+      end
+
+      valid_trips = @driven_trips.length - in_progress
+
+      return valid_trips == 0 ? 0 : sum.to_f/valid_trips
+    end
+
+    def add_driven_trip(trip)
+      raise ArgumentError, "Invalid trip object" unless trip.instance_of?(Trip)
+      @driven_trips << trip
+    end
+
+    def total_revenue
+      sum = 0
+
+      @driven_trips.each do |driven_trip|
+        sum += (driven_trip.cost - 1.65) * 0.8 unless driven_trip.end_time == nil
+      end
+
+      return sum.round(2)
+    end
+
+    def net_expenditures
+      return super - self.total_revenue
+    end
+
+    def make_unavailable
+      @status = :UNAVAILABLE
+    end
   end
 end