Merge pull request #43 from CShekta/cas/master

Cas/master

Author: kariabancroft

README.md

@@ -35,13 +35,15 @@ Create an `Account` class which should have the following functionality:
 - Add an `owner` property to each Account to track information about who owns the account.
   - The `Account` can be created with an `owner`, OR you can create a method that will add the `owner` after the `Account` has already been created.
 
-<!--
+
 ## Wave 2
 ### CSV Files!
+- Update the `Account` class to be able to handle all of these fields from the CSV file used as input.
+  - For example, manually choose the data from the first line of the CSV file and ensure you can create a new instance of your Account using that data
 - Add the following **class** methods to your existing `Account` class
   - `self.all` - returns a collection of `Account` instances, representing all of the Accounts described in the CSV. See below for the CSV file specifications
   - `self.find(id)` - returns an instance of `Account` where the value of the id field in the CSV matches the passed parameter
-- Update the `Account` class to be able to handle all of these fields from the CSV file used as input.
+
 
 #### CSV Data File
   Bank::Account
@@ -57,6 +59,21 @@ Create an `Account` class which should have the following functionality:
     - `self.all` - returns a collection of `Owner` instances, representing all of the Owners described in the CSV. See below for the CSV file specifications
     - `self.find(id)` - returns an instance of `Owner` where the value of the id field in the CSV matches the passed parameter
 
+    Bank::Owner  
+    The data, in order in the CSV, consists of:  
+    **ID** - (Fixnum) a unique identifier for that Owner  
+    **Last Name** - (String) the owner's last name   
+    **First Name** - (String) the owner's first name  
+    **Street Addess** - (String) the owner's street address  
+    **City** - (String) the owner's city  
+    **State** - (String) the owner's state  
+
+    To create the relationship between the accounts and the owners use the `account_owners` CSV file.
+    The data for this file, in order in the CSV, consists of:
+    **Account ID** - (Fixnum) a unique identifier corresponding to an account
+    **Owner ID** - (Fixnum) a unique identifier corresponding to an owner
+
+<!--
 ## Wave 3
 Create a `SavingsAccount` class which should inherit behavior from the `Account` class. It should include updated logic with the following functionality:
 - An updated `initialize` method:

bank_account.rb

@@ -1,12 +1,16 @@
+require 'CSV'
+#TO DO
+#Use .map for the all method? since it returns an array you don't need to create one
 module Bank
 
   class Account
-    attr_reader :balance, :id, :owner
-    def initialize(balance = 0, id = 7383092, owner = nil)
-      @balance = balance
+    attr_accessor :balance, :id, :owner, :open_date
+    def initialize(id, balance, open_date, owner = nil)
+      @balance = balance.to_i
       @id = 7383092
       @owner = owner
-      if balance < 0
+      @open_date = open_date
+      if @balance < 0
         raise ArgumentError, "Accounts cannot be opened with negative money"
       end
     end
@@ -33,37 +37,80 @@ def check_balance
     def add_owner(owner)
       @owner = owner
     end
+
+    def self.all
+      acct_csv_array = CSV.read("support/accounts.csv")
+      account_array = []
+      acct_csv_array.each do |line|
+        account_array.push(Account.new(line[0], line[1], line[2]))
+      end
+      return account_array
+    end
+
+    def self.find(id)
+      acct_csv_array = CSV.read("support/accounts.csv")
+      match_line = acct_csv_array.find do |line|
+        line[0].to_i == id
+      end
+      specific_account = Account.new(match_line[0], match_line[1], match_line[2])
+    end
+
+    def self.associate_everything
+      account_and_owner_csv = CSV.read("support/account_owners.csv")
+      everything_array = []
+      account_and_owner_csv.each do |line|
+        each_account = Bank::Account.find(line[0].to_i)
+        each_owner = Bank::Owner.find(line[1].to_i)
+        each_account.add_owner(each_owner)
+        everything_array.push(each_account)
+      end
+      return everything_array
+    end
   end
 
   class Owner
-    attr_reader :account, :first_name, :last_name, :address, :email, :owner_id
-    def initialize(owner_hash)
+    attr_reader :account, :owner_id, :last_name, :first_name, :address, :city, :state
+    def initialize(id, last_name, first_name, address, city, state)
       @account = account
-      @first_name = owner_hash[:first_name]
-      @last_name = owner_hash[:last_name]
-      @address = owner_hash[:address]
-      @email = owner_hash[:email]
-      @owner_id = owner_hash[:id]
+      @first_name = first_name
+      @last_name = last_name
+      @address =  address
+      @owner_id = owner_id
     end
 
     def who_da_owna
       puts "This account is owned by #{@first_name} #{@last_name} with #{@owner_id}"
     end
+
+    def self.all
+      owner_csv_array = CSV.read("support/owners.csv")
+      owner_array = []
+      owner_csv_array.each do |line|
+        owner_array.push(Owner.new(line[0], line[1], line[2], line[3], line[4], line[5]))
+      end
+      return owner_array
+    end
+
+    def self.find(id)
+      owner_csv_array = CSV.read("support/owners.csv")
+      match_line = owner_csv_array.find do |line|
+        line[0].to_i == id
+      end
+      specific_owner = Owner.new(match_line[0], match_line[1], match_line[2], match_line[3], match_line[4], match_line[5])
+    end
   end
 end
 
-owner_hash = {
-first_name: "Winnie",
-last_name: "The Pooh",
-address: "Deep in the Hundred Acre Woods",
-email: "[email protected]",
-id: 2376423
-}
+# owner_hash = {
+# first_name: "Winnie",
+# last_name: "The Pooh",
+# address: "Deep in the Hundred Acre Woods",
+# email: "[email protected]",
+# id: 2376423
+# }
 
-a = Bank::Account.new
-o = Bank::Owner.new(owner_hash)
-a.add_owner(o)
-puts "#{a.owner.first_name}"
-a.deposit(100)
-a.withdraw(50)
-a.withdraw(70)
+#a = Bank::Account.new("1212","1235667","1999-03-27 11:30:09 -0800")
+#a.check_balance
+#Bank::Account.all
+#o = Bank::Owner.new(owner_hash)
+#puts "#{a.owner.first_name}"

support/account_owners.csv

@@ -0,0 +1,12 @@
+1212,25
+1213,24
+1214,19
+1215,14
+1216,18
+1217,15
+15151,17
+15152,16
+15153,21
+15154,20
+15155,22
+15156,23

support/accounts.csv

@@ -0,0 +1,12 @@
+1212,1235667,1999-03-27 11:30:09 -0800
+1213,66367,2010-12-21 12:21:12 -0800
+1214,9876890,2007-09-22 11:53:00 -0800
+1215,919191,2011-10-31 13:55:55 -0800
+1216,100022,2000-07-07 15:07:55 -0800
+1217,12323,2003-11-07 11:34:56 -0800
+15151,9844567,1993-01-17 13:30:56 -0800
+15152,34343434343,1999-02-12 14:03:00 -0800
+15153,2134,2013-11-07 09:04:56 -0800
+15154,43567,1996-04-17 08:44:56 -0800
+15155,999999,1990-06-10 13:13:13 -0800
+15156,4356772,1994-11-17 14:04:56 -0800

support/owners.csv

@@ -0,0 +1,12 @@
+14,Morales,Wanda,9003 Gerald Hill,Honolulu,Hawaii
+15,Foster,Shirley,79734 Namekagon Court,Tampa,Florida
+16,Taylor,James,9 Portage Court,Winston Salem,North Carolina
+17,Ross,Marilyn,0 Delaware Circle,Seattle,Washington
+18,Gonzalez,Laura,310 Hauk Street,Springfield,Illinois
+19,Cooper,Ruby,99 American Road,Atlanta,Georgia
+20,Knight,Helen,3373 American Point,Charlotte,North Carolina
+21,Bell,Jessica,06 Kenwood Hill,Lansing,Michigan
+22,Sanders,Annie,8113 Sutherland Center,Everett,Washington
+23,Berry,Shirley,7 Kings Pass,Cleveland,Ohio
+24,King,Kevin,3499 Judy Center,Santa Monica,California
+25,Clark,Kathleen,72984 Chive Hill,New York City,New York