complete

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

@@ -20,9 +20,23 @@ public class ItemParser {
 
     public Item parseStringIntoItem(String rawItem) throws ItemParseException{
         List<String> list = findKeyValuePairsInRawItemData(rawItem);
+        Map<String, String> map = getItemMap(list);
+        try {
+            return new Item(
+                    rmvZeros(map.get("name")),
+                    Double.parseDouble(map.get("price")),
+                    map.get("type"),
+                    map.get("expiration"));
+
+        } catch (NullPointerException n) {
+            throw new ItemParseException();
+        }
+    }
+
+    private Map<String,String> getItemMap(List<String> list) {
         Map<String, String> map = new HashMap<>();
         for (String string : list){
-            Pattern keyPattern = Pattern.compile("([a-zA-Z0-9]+)(?=\\:)"); //(.+)(?=[\:])
+            Pattern keyPattern = Pattern.compile("([\\w]+)(?=\\:)"); //(.+)(?=[\:])
             Matcher keyMatch = keyPattern.matcher(string);
             Pattern valPattern = Pattern.compile("(?<=[\\:])([^##]+)");
             Matcher valMatch = valPattern.matcher(string);
@@ -30,16 +44,8 @@ public class ItemParser {
                 map.put(lower(keyMatch.group()), lower(valMatch.group()));
             }
         }
-        try {
-            return new Item(rmvZeros(map.get("name")), Double.parseDouble(map.get("price")), map.get("type"), map.get("expiration"));
-        } catch (NullPointerException n) {
-            throw new ItemParseException();
-        }
-//        Pattern p = Pattern.compile("[^a-zA-Z0-9\\:\\.\\/]");
-//        Matcher m = p.matcher(rawItem);
-//        String replaced = m.replaceAll("-");
-//        String otherPatter = "([a-zA-Z0-9\\/\\:\\.]+)(?=[^\\/])";
 
+        return map;
     }
 
     public ArrayList<String> findKeyValuePairsInRawItemData(String rawItem){
@@ -56,7 +62,7 @@ public class ItemParser {
     private String lower(String input) {
         StringBuilder inputLineT = new StringBuilder(input);
         for (int i = 0; i < inputLineT.length(); i++) {
-            if (inputLineT.charAt(i) >= 65 && inputLineT.charAt(i) < 91 && i > 0) {
+            if (inputLineT.charAt(i) >= 65 && inputLineT.charAt(i) < 91) {
                 inputLineT.setCharAt(i, (char) (inputLineT.charAt(i) + 32));
             }
         }

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

@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 
 
 public class Main {
-    public static int count;
+    private static int count;
     Map<String, List<Double>> map = new HashMap<>();
 
     private String readRawDataToString() throws Exception{
@@ -39,19 +39,37 @@ public class Main {
         return list.size();
     }
 
+    private String getCountPhrase(int num){
+        return num == 1 ? num + " time": num + " times";
+    }
+
     public String writeOutput(){
         StringBuilder sb = new StringBuilder();
+        String column1; String column2;
+
         for (String s : map.keySet()){
-            List<Double> l = map.get(s).stream().distinct().collect(Collectors.toList());
-            sb.append(String.format("%14s %8s %14s\n","name: " + s, " ", "seen: " + map.get(s).size()));
+            List<Double> prices = map.get(s);
+            List<Double> uniquePrices = prices.stream().distinct().collect(Collectors.toList());
+
+            column1 = String.format("%-7s%7s", "Name: ", s);
+            column2 = String.format("%-7s%7s","Seen: ", getCountPhrase(prices.size()));
+
+            sb.append(String.format("%14s %8s %14s\n",column1, " ",column2));
             sb.append(String.format("%14s %8s %14s\n","==============", " ", "=============="));
-            for (Double d : l) {
-                sb.append(String.format("%14s %8s %14s\n","Price: " + d, " ", "seen: " + getCount(map.get(s),d)));
+
+            for (Double d : uniquePrices) {
+                column1 = String.format("%-7s%7s", "Price: ", d);
+                column2 = String.format("%-7s%7s","Seen: ", getCountPhrase(getCount(prices,d)));
+
+                sb.append(String.format("%14s %8s %14s\n",column1, " ",column2));
                 sb.append(String.format("%14s %8s %14s\n","--------------", " ", "--------------"));
             }
+            sb.append("\n");
         }
 
-        sb.append("\n").append(count);
+        column1 = "Errors";
+        column2 = String.format("%-7s%7s","Seen: ", getCountPhrase(count));
+        sb.append(String.format("%-14s %8s %14s",column1, " ",column2));
         return sb.toString();
     }