Melissa_Pushpa_Edges_OO_RideShare

lib/driver.rb

@@ -0,0 +1,86 @@
+require_relative 'trip'
+require 'pry'
+
+module RideShare
+
+  class Driver < User
+
+    attr_reader :vin, :status, :driven_trips
+
+    def initialize(input)
+
+      if input[:id].nil? || input[:id] <= 0
+        raise ArgumentError, 'ID cannot be blank or less than zero.'
+      end
+
+      if input[:vin] == nil || input[:vin].length != 17 || input[:vin] == " "
+        # binding.pry
+        raise ArgumentError, 'Vin inaccurate, must be 17 characters long.'
+      end
+
+
+      super(input)
+      # @id = input[:id].to_i
+      # @name = input[:name].to_s
+      @vin	= input[:vin].to_s
+      @status = input[:status]
+      @driven_trips	= []
+
+      # status_array = [:AVAILABLE, :UNAVAILABLE ]
+
+
+
+
+      # binding.pry
+      # unless @status.include?(status_array)
+      #   raise ArgumentError. "Invalid status, you entered: #{status}"
+      # end
+
+
+    end
+
+    def add_driven_trip(trip)
+      unless trip.is_a? Trip
+        raise ArgumentError, "Got a thing that wasn't a trip! (#{trip.class})"
+      end
+      @driven_trips << trip
+
+    end
+
+
+
+
+    def average_rating #sums rating from all drivers trips and returns the average
+      trip_sum = 0.0
+      @driven_trips.each do |trip|
+        trip_sum += trip.rating
+      end
+      if @driven_trips == []
+        return 0
+      else
+        return trip_sum / @driven_trips.length
+      end
+    end
+
+
+    def total_revenue #calculates the drivers total revenue across all of the trips
+      sum = 0.0
+      sum_tax = 1.65
+      total_rev = 0
+      @driven_trips.each do |trip|
+        sum = (trip.cost - sum_tax) * 0.8
+        total_rev += sum
+      end
+      return total_rev
+    end
+
+    def net_expenditures
+    end
+
+
+
+  end
+
+
+
+end

lib/trip.rb

@@ -1,20 +1,34 @@
 require 'csv'
+require 'pry'
 
 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)
-      @id = input[:id]
-      @passenger = input[:passenger]
+      @id = input[:id] #trip ID
+      @driver = input[:driver] #driver for the trip
+      @passenger = input[:passenger] #passenger ID
       @start_time = input[:start_time]
       @end_time = input[:end_time]
       @cost = input[:cost]
-      @rating = input[:rating]
+      @rating = input[:rating].to_f
 
       if @rating > 5 || @rating < 1
         raise ArgumentError.new("Invalid rating #{@rating}")
       end
+
+
+      unless @end_time > @start_time
+        raise ArgumentError.new("end time can not be before the start time end time is: #{@end_time} start time is #{@start_time}")
+      end
+
+    end
+
+    def duration
+      # binding.pry
+      trip_in_seconds = @end_time - @start_time
+      return trip_in_seconds
     end
 
     def inspect

lib/trip_dispatcher.rb

@@ -1,16 +1,19 @@
 require 'csv'
 require 'time'
-
+require 'pry'
 require_relative 'user'
 require_relative 'trip'
+require_relative 'driver'
 
 module RideShare
   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
 
@@ -36,29 +39,87 @@ def load_trips(filename)
                                           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)
+
+
+        start_time = Time.parse(raw_trip[:start_time])
+        end_time = Time.parse(raw_trip[:end_time])
 
+        # in trips ID = Driver ID
         parsed_trip = {
-          id: raw_trip[:id].to_i,
-          passenger: passenger,
-          start_time: raw_trip[:start_time],
-          end_time: raw_trip[:end_time],
+          id: raw_trip[:id].to_i, #trip ID
+          passenger: passenger, #passenger ID
+          start_time: start_time,
+          end_time: end_time,
           cost: raw_trip[:cost].to_f,
-          rating: raw_trip[:rating].to_i
+          rating: raw_trip[:rating].to_i,
+          driver: driver
         }
-
+        # adding passenger from user.rb to into trip
         trip = Trip.new(parsed_trip)
         passenger.add_trip(trip)
+        driver.add_trip(trip)
+        driver.add_trip(trip)
         trips << trip
-      end
 
+      end
       return trips
     end
 
-    def find_passenger(id)
-      check_id(id)
-      return @passengers.find { |passenger| passenger.id == id }
-    end
+    def load_drivers(filename)
+
+      drivers = []
+
+      driver_data = CSV.open(filename, 'r', headers: true,
+        header_converters: :symbol)
+
+        driver_data.each do |raw_driver|
+
+          driver_name = find_passenger(raw_driver[:id].to_i).name
+          driver_phone = find_passenger(raw_driver[:id].to_i).phone_number
+
+          parsed_trip = {
+            id: raw_driver[:id].to_i, #trip ID
+            vin: raw_driver[:vin],
+            status: raw_driver[:status].to_sym,
+            name: driver_name.to_s,
+            phone: driver_phone
+
+          }
+
+
+          drivers << Driver.new(parsed_trip)
+      # binding.pry
+      #     # find them and replace the `User` object with a `Driver` object. You should also be loading the `driven_tripss` for each `Driver` at this stage.
+      #     # driver = @passengers.find do |user|
+      #     #   user == driver
+      #
+          end
+      #     # add to drivers array
+      #     # passenger.add_driver(driver)
+      #     binding.pry
+      #
+      #     drivers << driver
+      #     # end
+      #   end
+        return drivers
+
+      end
+
+      def find_driver(id)
+        check_id(id)
+        return @drivers.find { |driver| driver.id == id }
+      end
+
+      def find_passenger(id)
+        check_id(id)
+        return @passengers.find { |passenger| passenger.id == id }
+      end
+
+
+
 
     def inspect
       return "#<#{self.class.name}:0x#{self.object_id.to_s(16)} \
@@ -67,7 +128,7 @@ def inspect
               #{passengers.count} passengers>"
     end
 
-    private
+    # private
 
     def check_id(id)
       raise ArgumentError, "ID cannot be blank or less than zero. (got #{id})" if id.nil? || id <= 0

lib/user.rb

@@ -1,3 +1,5 @@
+require 'pry'
+
 module RideShare
   class User
     attr_reader :id, :name, :phone_number, :trips
@@ -7,7 +9,7 @@ def initialize(input)
         raise ArgumentError, 'ID cannot be blank or less than zero.'
       end
 
-      @id = input[:id]
+      @id = input[:id] #user_ID/PassengerID
       @name = input[:name]
       @phone_number = input[:phone]
       @trips = input[:trips].nil? ? [] : input[:trips]
@@ -16,5 +18,27 @@ def initialize(input)
     def add_trip(trip)
       @trips << trip
     end
+
+
+    # return total amount of money user spent on trips
+    def net_expenditures
+      ride_total = 0
+      @trips.each do |trip|
+        ride_total += trip[:cost]
+      end
+      return ride_total
+    end
+
+    # RideShare::Trip.duration - don't need RideShare? NO, same module
+
+    # return total amout of time user has spent on the trips
+    def total_time_spent
+      total_time = 0
+      @trips.each do |trip|
+        trip_in_seconds = trip[:end_time] - trip[:start_time]
+        total_time += trip_in_seconds
+      end
+      return total_time
+    end
   end
 end

specs/driver_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'spec_helper'
 
-xdescribe "Driver class" do
+describe "Driver class" do
 
     describe "Driver instantiation" do
       before do
@@ -18,28 +18,25 @@
         expect{ RideShare::Driver.new(id: 0, name: "George", vin: "33133313331333133")}.must_raise ArgumentError
       end
 
+
       it "throws an argument error with a bad VIN value" do
         expect{ RideShare::Driver.new(id: 100, name: "George", vin: "")}.must_raise ArgumentError
         expect{ RideShare::Driver.new(id: 100, name: "George", vin: "33133313331333133extranums")}.must_raise ArgumentError
       end
 
-      it "has a default status of :AVAILABLE" do
-        expect( (RideShare::Driver.new(id: 100, name: "George", vin: "12345678901234567")).status).must_equal :AVAILABLE
-      end
-
       it "sets driven trips to an empty array if not provided" do
         expect(@driver.driven_trips).must_be_kind_of Array
         expect(@driver.driven_trips.length).must_equal 0
       end
 
       it "is set up for specific attributes and data types" do
-        [:id, :name, :vehicle_id, :status, :driven_trips].each do |prop|
+        [:id, :name, :vin, :status, :driven_trips].each do |prop|
           expect(@driver).must_respond_to prop
         end
 
         expect(@driver.id).must_be_kind_of Integer
         expect(@driver.name).must_be_kind_of String
-        expect(@driver.vehicle_id).must_be_kind_of String
+        expect(@driver.vin).must_be_kind_of String
         expect(@driver.status).must_be_kind_of Symbol
       end
     end
@@ -69,7 +66,7 @@
                                         vin: "1C9EVBRM0YBC564DZ")
         trip = RideShare::Trip.new(id: 8, driver: @driver, passenger: nil,
                                    start_time: Time.parse("2016-08-08"),
-                                   end_time: Time.parse("2016-08-08"), rating: 5)
+                                   end_time: Time.parse("2016-08-09"), rating: 5)
         @driver.add_driven_trip(trip)
       end
 
@@ -102,11 +99,30 @@
 
     end
 
-  describe "total_revenue" do
-    # You add tests for the total_revenue method
+    describe "total_revenue" do
+      before do
+        @driver = RideShare::Driver.new(id: 54, name: "Rogers Bartell IV",
+                                        vin: "1C9EVBRM0YBC564DZ")
+        trip1 = RideShare::Trip.new(id: 8, driver: @driver, passenger: nil,
+                                   start_time: Time.parse("2016-08-08"),
+                                   end_time: Time.parse("2016-08-09"), rating: 5, cost: 10.00)
+        @driver.add_driven_trip(trip1)
+        trip2 = RideShare::Trip.new(id: 8, driver: @driver, passenger: nil,
+                                   start_time: Time.parse("2016-08-08"),
+                                   end_time: Time.parse("2016-08-09"), rating: 5, cost: 20.00)
+        @driver.add_driven_trip(trip2)
+
+      end
+
+
+      it " driver's total revenue across all their trips"do
+
+      expect(@driver.total_revenue).must_equal 21.36
+    end
+
   end
 
-  describe "net_expenditures" do
+  xdescribe "net_expenditures" do
     # You add tests for the net_expenditures method
   end
-end
+end

specs/spec_helper.rb

@@ -12,4 +12,4 @@
 require_relative '../lib/user'
 require_relative '../lib/trip'
 require_relative '../lib/trip_dispatcher'
-#require_relative '../lib/driver'
+require_relative '../lib/driver'

specs/test_data/trips_test.csv

@@ -1,6 +1,6 @@
 id,driver_id,passenger_id,start_time,end_time,cost,rating
 1,2,1,2018-05-25 11:52:40 -0700,2018-05-25 12:25:00 -0700,10,5
-2,2,3,2018-07-23 04:39:00 -0700,2018-07-25 04:55:00 -0700,7,3
+2,2,3,2018-07-23 04:39:00 -0700,2018-07-23 04:55:00 -0700,7,3
 3,5,4,2018-06-11 22:22:00 -0700,2018-06-11 22:57:00 -0700,15,4
 4,5,7,2018-08-12 15:04:00 -0700,2018-08-12 15:14:00 -0700,8,1
-5,5,6,2018-08-05 08:58:00 -0700,2018-08-05 09:30:00 -0700,32,1
+5,5,6,2018-08-05 08:58:00 -0700,2018-08-05 09:30:00 -0700,32,1