Implemented the returning the item based on user checked out history.

h4rikris · Jun 22, 2015 · f887222 · f887222
1 parent c4f5984
commit f887222
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/src/com/tw/pathashala/models/Library.java b/src/com/tw/pathashala/models/Library.java
@@ -40,7 +40,7 @@ public String checkOut(String bookName) {
     }
 
     public String checkedOutItems() {
-        return displayItems(checkedOutRentableItems);
+        return displayItems(userHistory.getItemList());
     }
 
     private String displayItems(ArrayList<RentableItem> listOfRentableItems) {
@@ -56,7 +56,7 @@ private String displayItems(ArrayList<RentableItem> listOfRentableItems) {
     }
 
     public String returnItem(String bookName) {
-        ArrayList<RentableItem> rentableItems = searchAgent.search(checkedOutRentableItems, bookName);
+        ArrayList<RentableItem> rentableItems = searchAgent.search(userHistory.getItemList(), bookName);
         for (RentableItem book : rentableItems) {
             RentableItem returnedRentableItem = book.returnItem();
             checkedOutRentableItems.remove(book);

diff --git a/src/com/tw/pathashala/models/UserHistory.java b/src/com/tw/pathashala/models/UserHistory.java
@@ -26,6 +26,11 @@ private User getCurrentLoggedInUser() {
         return authentication.getCurrentLoggedInUser();
     }
 
+    public ArrayList<RentableItem> getItemList() {
+        User currentLoggedInUser = getCurrentLoggedInUser();
+        return userCheckOutHistory.get(currentLoggedInUser);
+    }
+
     @Override
     public String toString() {
         StringBuilder output = new StringBuilder();

diff --git a/tests/com/tw/pathashala/models/LibraryTest.java b/tests/com/tw/pathashala/models/LibraryTest.java
@@ -13,6 +13,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class LibraryTest {
 
@@ -71,8 +72,7 @@ public void testForNotToDisplayBookDetailsHavingFutureYearOfPublication() {
 
     @Test
     public void testForDisplayCheckedOutBookDetails() {
-        checkedOutRentableItems.clear();
-        checkedOutRentableItems.add(new CheckedOutBook("Java", "Hari", 2015));
+        userHistory.addItem(new CheckedOutBook("Java", "Hari", 2015));
         Library library = new Library(availableRentableItems, checkedOutRentableItems, search, userHistory);
 
         String booksDetails = library.checkedOutItems();
@@ -163,11 +163,34 @@ public void shouldAddCheckOutItemToUserHistory() {
     @Test
     public void shouldRemoveReturnedItemFromUserHistory() {
         UserHistory userHistory = Mockito.mock(UserHistory.class);
+        when(userHistory.getItemList()).thenReturn(checkedOutRentableItems);
         Library library = new Library(availableRentableItems, checkedOutRentableItems, search, userHistory);
 
         library.returnItem("Oriented");
         RentableItem item = new CheckedOutBook("Oriented", "SSS", 2014);
 
         verify(userHistory).removeItem(item);
     }
+
+    @Test
+    public void shouldGetReturnItemsFromUserHistory() {
+        UserHistory userHistory = Mockito.mock(UserHistory.class);
+        Library library = new Library(availableRentableItems, checkedOutRentableItems, search, userHistory);
+
+        library.checkedOutItems();
+
+        verify(userHistory).getItemList();
+    }
+
+    @Test
+    public void shouldGetCheckedItemsFromHistoryWhileReturningItem() {
+        UserHistory userHistory = Mockito.mock(UserHistory.class);
+        when(userHistory.getItemList()).thenReturn(checkedOutRentableItems);
+        Library library = new Library(availableRentableItems, checkedOutRentableItems, search, userHistory);
+
+        library.returnItem("Oriented");
+        RentableItem item = new CheckedOutBook("Oriented", "SSS", 2014);
+
+        verify(userHistory).getItemList();
+    }
 }