almost done

src/main/java/io/zipcoder/ItemParser.java

@@ -1,86 +1,110 @@
 package io.zipcoder;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Scanner;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class ItemParser {
+    public HashMap<String, ArrayList<Item>> completeList = new HashMap<String, ArrayList<Item>>();
+    int exceptionCounter = 0;
 
 
-    public ArrayList<String> parseRawDataIntoStringArray(String rawData){
+    public ArrayList<String> parseRawDataIntoStringArray(String rawData) {
         String stringPattern = "##";
-        ArrayList<String> response = splitStringWithRegexPattern(stringPattern , rawData);
+        ArrayList<String> response = splitStringWithRegexPattern(stringPattern, rawData);
         return response;
     }
 
-    public Item parseStringIntoItem(String rawItem) throws ItemParseException{
+    public Item parseStringIntoItem(String rawItem) throws ItemParseException {
+        if (nameFinder(rawItem) == null || priceFinder(rawItem) == null) {
+            throw new ItemParseException();
+        }
 
         String name = nameFinder(rawItem);
         Double price = Double.parseDouble(priceFinder(rawItem));
         String type = "food";
         String expiration = expFinder(rawItem);
-        return new Item(name, price, type, expiration);
-
 
+        return new Item(name, price, type, expiration);
     }
 
-    public ArrayList<String> findKeyValuePairsInRawItemData(String rawItem){
+    public ArrayList<String> findKeyValuePairsInRawItemData(String rawItem) {
         String stringPattern = "[;|^]";
-        ArrayList<String> response = splitStringWithRegexPattern(stringPattern , rawItem);
+        ArrayList<String> response = splitStringWithRegexPattern(stringPattern, rawItem);
         return response;
     }
 
-    private ArrayList<String> splitStringWithRegexPattern(String stringPattern, String inputString){
+    private ArrayList<String> splitStringWithRegexPattern(String stringPattern, String inputString) {
         return new ArrayList<String>(Arrays.asList(inputString.split(stringPattern)));
     }
 
-    public String nameFinder (String rawNames) throws Exception {
+    public String nameFinder(String rawNames) {
         StringBuilder found = new StringBuilder();
 
         String itemSearch = rawNames;
         Pattern foodNames = Pattern.compile("\\w+(?=\\Wprice)", Pattern.CASE_INSENSITIVE);
         Matcher m = foodNames.matcher(itemSearch);
         int lastMatchPos = 0;
-           while (m.find())
-            {
-                found.append(m.group()+"\n");
+        while (m.find()) {
+            if (!m.group().equals("")) {
+                found.append(m.group().replaceAll("\\d", "o"));
                 lastMatchPos = m.end();
             }
-        return found.toString();
+            return found.toString().toLowerCase();
+        }
+        return null;
     }
 
-    public String priceFinder (String rawPrices) throws Exception {
+    public String priceFinder(String rawPrices) {
         StringBuilder found = new StringBuilder();
 
         String itemSearch = rawPrices;
         Pattern foodNames = Pattern.compile("\\d+\\.\\d\\d", Pattern.CASE_INSENSITIVE);
         Matcher m = foodNames.matcher(itemSearch);
         int lastMatchPos = 0;
-        while (m.find())
-        {
-            found.append(m.group()+"\n");
-            lastMatchPos = m.end();
+        while (m.find()) {
+            if (!m.group().equals("")) {
+                found.append(m.group() + "");
+                lastMatchPos = m.end();
+            }
+            return found.toString();
         }
-        return found.toString();
+        return null;
     }
 
-    public String expFinder (String rawExp) throws Exception {
+    public String expFinder(String rawExp) {
         StringBuilder found = new StringBuilder();
 
         String itemSearch = rawExp;
         Pattern foodNames = Pattern.compile("\\d{1,2}\\/\\d\\d\\/\\d{4}", Pattern.CASE_INSENSITIVE);
         Matcher m = foodNames.matcher(itemSearch);
         int lastMatchPos = 0;
-        while (m.find())
-        {
-            found.append(m.group()+"\n");
+        while (m.find()) {
+            found.append(m.group() + "");
             lastMatchPos = m.end();
         }
         return found.toString();
     }
 
 
+    public HashMap<String, ArrayList<Item>> getCompleteList() throws Exception {
+        Main mainObject = new Main();
+        ArrayList<String> rawinputdata = parseRawDataIntoStringArray(mainObject.readRawDataToString());
+        for (String item : rawinputdata) {
+            try {
+                Item myItem = parseStringIntoItem(item);
+                if (!completeList.containsKey(myItem.getName())) {
+                    ArrayList<Item> myItemList = new ArrayList<Item>();
+                    myItemList.add(myItem);
+                    completeList.put(myItem.getName(), myItemList);
+                } else {
+                    completeList.get(myItem.getName()).add(myItem);
+                }
+
+            } catch (ItemParseException except) {
+                exceptionCounter++;
+            }
+        }
+        return completeList;
+    }
 }

src/main/java/io/zipcoder/Main.java

@@ -2,9 +2,7 @@ package io.zipcoder;
 
 import org.apache.commons.io.IOUtils;
 
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -12,18 +10,26 @@ import java.util.regex.Pattern;
 public class Main {
 
 
-    public String readRawDataToString() throws Exception{
+    public String readRawDataToString() throws Exception {
         ClassLoader classLoader = getClass().getClassLoader();
         String result = IOUtils.toString(classLoader.getResourceAsStream("RawData.txt"));
         return result;
     }
 
-    public static void main(String[] args) throws Exception{
+    public static void main(String[] args) throws Exception {
         String output = (new Main()).readRawDataToString();
 
         System.out.println(output);
         // TODO: parse the data in output into items, and display to console.
 
+
+        ItemParser itemParser = new ItemParser();
+        HashMap<String, ArrayList<Item>> testMap = itemParser.getCompleteList();
+        for (String key : testMap.keySet()) {
+            for (int i = 0; i < testMap.get(key).size(); i++) {
+                System.out.println(key + " " + testMap.get(key).get(i).getPrice());
+            }
+        }
+        }
     }
 
-}

src/test/java/io/zipcoder/ItemParserTest.java

@@ -18,7 +18,7 @@ public class ItemParserTest {
 
     private String rawSingleItemIrregularSeperatorSample = "naMe:MiLK;price:3.23;type:Food^expiration:1/11/2016##";
 
-    private String rawBrokenSingleItem =    "naMe:Milk;price:3.23;type:Food;expiration:1/25/2016##";
+    private String rawBrokenSingleItem =    "naMe:;price:3.23;type:Food;expiration:1/25/2016##";
 
     private String rawMultipleItems = "naMe:Milk;price:3.23;type:Food;expiration:1/25/2016##"
                                       +"naME:BreaD;price:1.23;type:Food;expiration:1/02/2016##"
@@ -84,4 +84,12 @@ public class ItemParserTest {
         System.out.println(itemSearch);
 
     }
+
+    @Test
+    public void parseStringIntoItemTestMultiple() throws ItemParseException{
+        Item expected = new Item("milk", 3.23, "food","1/11/2016");
+        Item actual = itemParser.parseStringIntoItem(rawMultipleItems);
+        assertEquals(expected.toString(), actual.toString());
+    }
+
 }