Merge branch 'master' into exercise/completed

Author: tboychuk

account-analytics/src/main/java/com.bobocode/AccountAnalytics.java

@@ -1,5 +1,6 @@
 package com.bobocode;
 
+import com.bobocode.exception.EntityNotFoundException;
 import com.bobocode.model.Account;
 import com.bobocode.model.Sex;
 
@@ -116,6 +117,26 @@ public boolean containsAccountWithEmailDomain(String emailDomain) {
                 .anyMatch(email -> email.split("@")[1].equals(emailDomain));
     }
 
+    /**
+     * Returns account balance by its email. Throws {@link EntityNotFoundException} with message
+     * "Cannot find Account by email={email}" if account is not found.
+     *
+     * @param email account email
+     * @return account balance
+     */
+    public BigDecimal getBalanceByEmail(String email) {
+        throw new UnsupportedOperationException("It's your job to implement this method"); // todo
+    }
+
+    /**
+     * Collects all existing accounts into a {@link Map} where a key is account id, and the value is {@link Account} instance
+     *
+     * @return map of accounts by its ids
+     */
+    public Map<Long, Account> collectAccountsById() {
+        throw new UnsupportedOperationException("It's your job to implement this method"); // todo
+    }
+
     /**
      * Returns a {@link Map} where key is {@link Account#lastName} and values is a {@link Set} that contains first names
      * of all accounts with a specific last name.

account-analytics/src/main/java/com.bobocode/exception/EntityNotFoundException.java

@@ -0,0 +1,7 @@
+package com.bobocode.exception;
+
+public class EntityNotFoundException extends RuntimeException {
+    public EntityNotFoundException(String message) {
+        super(message);
+    }
+}

account-analytics/src/test/java/com/bobocode/AccountAnalyticsTest.java

@@ -1,5 +1,6 @@
 package com.bobocode;
 
+import com.bobocode.exception.EntityNotFoundException;
 import com.bobocode.model.Account;
 import com.bobocode.model.Sex;
 import org.junit.Before;
@@ -9,13 +10,10 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.Month;
 import java.util.*;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * The helper method of this test class do not use Stream API intentionally. You should try to find a stream-based
@@ -127,6 +125,36 @@ public void testContainsAccountWithEmailDomain() {
         assertFalse(analytics.containsAccountWithEmailDomain("ukr.net"));
     }
 
+    @Test
+    public void testGetBalanceByEmail() {
+        Account account = accounts.get(1);
+        BigDecimal balance = analytics.getBalanceByEmail(account.getEmail());
+
+        assertEquals(account.getBalance(), balance);
+    }
+
+    @Test
+    public void testGetBalanceByEmailThrowsException() {
+        String fakeEmail = "fake@mail.com";
+        try {
+            analytics.getBalanceByEmail(fakeEmail);
+            fail("Should throw exception");
+        } catch (Exception e) {
+            assertTrue(e instanceof EntityNotFoundException);
+            assertEquals(String.format("Cannot find Account by email=%s", fakeEmail), e.getMessage());
+        }
+    }
+
+    @Test
+    public void testCollectAccountsById() {
+        Map<Long, Account> idToAccountMap = analytics.collectAccountsById();
+
+        assertEquals(accounts.get(0), idToAccountMap.get(1L));
+        assertEquals(accounts.get(1), idToAccountMap.get(2L));
+        assertEquals(accounts.get(2), idToAccountMap.get(3L));
+        assertEquals(accounts.get(3), idToAccountMap.get(4L));
+    }
+
     @Test
     public void testGroupFirstNamesByLastNames() {
         Map<String, Set<String>> lastToFirstNamesMap = analytics.groupFirstNamesByLastNames();