From c9d1c834292612939d98c82781ac9d4ef11ea930 Mon Sep 17 00:00:00 2001
From: Shaina Karasin <skarasin39@gmail.com>
Date: Fri, 15 Dec 2017 21:39:58 +0000
Subject: [PATCH] checkpoint #7

---
 Gemfile.lock                   | 13 +++++++++++++
 controllers/menu_controller.rb |  1 +
 models/address_book.rb         |  7 ++-----
 models/entry.rb                |  2 ++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3b3e7ec..e390024 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,12 +2,25 @@ PATH
   remote: ../bloc_record
   specs:
     bloc_record (1.0.0)
+      activesupport
       sqlite3 (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (4.2.5)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.9.0)
     sqlite3 (1.3.13)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
diff --git a/controllers/menu_controller.rb b/controllers/menu_controller.rb
index 365d6df..9f24d19 100644
--- a/controllers/menu_controller.rb
+++ b/controllers/menu_controller.rb
@@ -75,6 +75,7 @@ def select_address_book_menu
   def view_all_entries
     @address_book.entries.each do |entry|
       system "clear"
+      puts "Entry from #{entry.address_book.name}"
       puts entry.to_s
       entry_submenu(entry)
     end
diff --git a/models/address_book.rb b/models/address_book.rb
index 242cf58..6bd5321 100644
--- a/models/address_book.rb
+++ b/models/address_book.rb
@@ -3,7 +3,8 @@
 #require 'bloc_record/base'
 
 class AddressBook < BlocRecord::Base
-
+  has_many :entries
+  
   def add_entry(name, phone_number, email)
       Entry.create(name: name, phone_number: phone_number, email: email, address_book_id: self.id)
   end
@@ -18,10 +19,6 @@ def import_from_csv(file_name)
     end
   end
   
-  def entries
-    Entry.where(address_book_id: self.id)
-  end
-  
   def find_entry(name)
     # given in checkpoint #4
      Entry.where(name: name, address_book_id: self.id).first
diff --git a/models/entry.rb b/models/entry.rb
index 91accb1..94f4bfc 100644
--- a/models/entry.rb
+++ b/models/entry.rb
@@ -1,6 +1,8 @@
 require 'bloc_record/base'
 
 class Entry < BlocRecord::Base
+  belongs_to :address_book
+  
   def to_s
     "Name: #{name}\nPhone Number: #{phone_number}\nEmail: #{email}"
   end