Merge a2d75e8cd984e32b2f51f7324f4feaa2aef31513 into 23c2c01bf07b924ac9b860fa2771bf6ceb246ad5

src/main/java/io/zipcoder/CostumException.java

@@ -0,0 +1,10 @@
+package io.zipcoder;
+
+public class CostumException extends Exception  {
+
+    static int errorCount = 0;
+
+    public CostumException(){
+        errorCount++;
+    }
+}

src/main/java/io/zipcoder/Item.java

@@ -1,5 +1,7 @@
 package io.zipcoder;
 
+import java.util.regex.Pattern;
+
 public class Item {
     private String name;
     private Double price;
@@ -22,21 +24,21 @@ public class Item {
         this.expiration = expiration;
     }
 
+    public Item(String name, String price) {
+    }
+
     public String getName() {
         return name;
     }
 
-
     public Double getPrice() {
         return price;
     }
 
-
     public String getType() {
         return type;
     }
 
-
     public String getExpiration() {
         return expiration;
     }

src/main/java/io/zipcoder/ItemListGenerator.java

@@ -0,0 +1,29 @@
+package io.zipcoder;
+
+import java.util.ArrayList;
+
+//public class ItemListGenerator {
+//
+//    ItemParser itemParser;
+//
+//    public ItemListGenerator(ItemParser itemParser) {
+//        this.itemParser = itemParser;
+//    }
+//
+//    public Item generateItems(String input){
+//      ArrayList<String> inputSeparatedByNewLine = itemParser.parseRawDataIntoStringArray(input);
+//      String[] splitString = input.split(input);
+//
+//
+//            String name = "Milk";
+//            Double price = 1.23;
+//            String type = "Food";
+//            String expiration = "1/25/2016";
+//            Item item = new Item(splitString);
+//
+//        return item;
+//    }
+//
+//
+//}
+

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

@@ -1,23 +1,51 @@
 package io.zipcoder;
 
+
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class ItemParser {
 
 
+    private String name;
+    private Double price;
+    private String type;
+    private String expiration;
+
     public ArrayList<String> parseRawDataIntoStringArray(String rawData){
         String stringPattern = "##";
-        ArrayList<String> response = splitStringWithRegexPattern(stringPattern , rawData);
+        ArrayList<String> response = splitStringWithRegexPattern(stringPattern , String.valueOf(rawData));
         return response;
     }
 
     public Item parseStringIntoItem(String rawItem) throws ItemParseException{
-        return null;
+        rawItem = rawItem.replaceAll("#", "");
+        ArrayList<String> keyValuePairsInRawItemData = findKeyValuePairsInRawItemData(rawItem);
+       // System.out.println(keyValuePairsInRawItemData);
+        for (String pair: keyValuePairsInRawItemData){
+            //System.out.println(pair);
+            if (pair.matches("[nameNAME]{4}"))
+                name = this.name(pair);
+            System.out.println(pair);
+            if(pair.matches("[pricePrice]{5}]"))
+                price = this.price(pair);
+            System.out.println(pair);
+            if(pair.matches("[type]{4}"))
+                type = this.type(pair);
+            System.out.println(pair);
+            if(pair.matches("[expriationEXPIRATION]{10}"))
+                expiration = this.expiration(pair);
+            System.out.println(pair);
+        }
+       return new Item(name, price, type, expiration);
+        //return name;
     }
 
+
     public ArrayList<String> findKeyValuePairsInRawItemData(String rawItem){
-        String stringPattern = "[;|^]";
+        String stringPattern = "[;|^|%|*|!|@]";
         ArrayList<String> response = splitStringWithRegexPattern(stringPattern , rawItem);
         return response;
     }
@@ -26,6 +54,106 @@ public class ItemParser {
         return new ArrayList<String>(Arrays.asList(inputString.split(stringPattern)));
     }
 
+     public String name(String value){
+        String name = null;
+        value = value.replaceAll("[~(nameNAME)~g]", "");
+            if (value.matches("[milkMILK]{4}")){
+                name= "Milk";
+            }
+            if (value.matches("[breadBREAD]{5}")){
+                name = "Bread";
+            }
+            if (value.matches("[cC]..[kK][iI][eE][sS]")){
+                name = "Cookies";
+            }
+            if (value.matches("[@applesAPPLES]{6}")){
+                name = "Apples";
+            }
+            return name;
+        }
+
+
+    public Double price(String value){
+        Double price = null;
+        Pattern pattern = Pattern.compile("\\d.\\d+(?=;)");
+        Matcher matcher = pattern.matcher(value);
+        if(matcher.find()){
+            price = Double.parseDouble(matcher.group(0));
+        }
+        return price;
+    }
+
+    public String type(String value){
+        String type = null;
+        value = value.replaceAll("[type]{4}", "");
+        if(value.matches("[fodFOD]{4}")) {
+            type = "Food";
+        }
+        System.out.println(type);
+        return type;
+    }
+
+    public String expiration(String value){
+        String expiration = null;
+        Pattern pattern = Pattern.compile("(\\d/\\d+/\\d+)");
+        Matcher matcher = pattern.matcher(value);
+        if (matcher.find()){
+            expiration = matcher.group();
+        }
+        return expiration;
+    }
+
 
+//    public String milk(String milk){
+//        Pattern pattern = Pattern.compile("[milkMILK]{4}");
+//        String output = "";
+//        Matcher matcher = pattern.matcher(milk);
+//        while (matcher.find()){
+//            output = matcher.group(0);
+//        }
+//        return output;
+//    }
+//
+//    public String bread(String bread){
+//        Pattern pattern = Pattern.compile("[breadBREAD]{5}");
+//        String output = "";
+//        Matcher matcher = pattern.matcher(bread);
+//        while (matcher.find()){
+//            output = matcher.group(0);
+//        }
+//        return output;
+//    }
+//
+//    public String cookies(String cookies){
+//        Pattern pattern = Pattern.compile("[cC]..[kK][iI][eE][sS]");
+//        String output = "";
+//        Matcher matcher = pattern.matcher(cookies);
+//        while (matcher.find()){
+//            output = matcher.group(0);
+//        }
+//        return output;
+//    }
+//
+//    public String apples(String apples){
+//        Pattern pattern = Pattern.compile("[@applesAPPLES]{6}");
+//        String output = "";
+//        Matcher matcher = pattern.matcher(apples);
+//        while (matcher.find()){
+//            output = matcher.group(0);
+//        }
+//        return output;
+//    }
+
+//    public String food(String food){
+//        Pattern pattern = Pattern.compile("([0fodFOD]{4})+.");
+//        String output = "";
+//        Matcher matcher = pattern.matcher(food);
+//        while (matcher.find()){
+//            output = matcher.group(0);
+//        }
+//        return output;
+//    }
 
 }
+
+

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

@@ -2,6 +2,8 @@ package io.zipcoder;
 
 import org.apache.commons.io.IOUtils;
 
+import java.util.ArrayList;
+
 
 public class Main {
 
@@ -13,7 +15,34 @@ public class Main {
 
     public static void main(String[] args) throws Exception{
         String output = (new Main()).readRawDataToString();
-        System.out.println(output);
+        //System.out.println(output);
+
+        ItemParser itemParser = new ItemParser();
+        //ArrayList<String> outputSeparated = itemParser.parseRawDataIntoStringArray(output);
+//
+//        for (String itemString: outputSeparated){
+//            System.out.println(itemString);
+//        }
+
         // TODO: parse the data in output into items, and display to console.
+        ArrayList<String> items = itemParser.parseRawDataIntoStringArray(output);
+//        ArrayList<String> items = itemParser.findKeyValuePairsInRawItemData(test);
+//        for (String item : items){
+//            System.out.println(item);
+//        }
+
+        ArrayList<ArrayList<String>> eachItem = new ArrayList<>();
+
+        for (String item : items){
+            ArrayList<String> itemArray = itemParser.findKeyValuePairsInRawItemData(item);
+            eachItem.add(itemArray);
+        }
+
+        for (ArrayList<String> itemDetail : eachItem){
+            System.out.println(itemDetail);
+        }
+
+
+        //System.out.println(test);
     }
 }

src/main/resources/RawData.txt

@@ -1 +1 @@
-naMe:Milk;price:3.23;type:Food;expiration:1/25/2016##naME:BreaD;price:1.23;type:Food;expiration:1/02/2016##NAMe:BrEAD;price:1.23;type:Food;expiration:2/25/2016##naMe:MiLK;price:3.23;type:Food^expiration:1/11/2016##naMe:Cookies;price:2.25;type:Food%expiration:1/25/2016##naMe:CoOkieS;price:2.25;type:Food*expiration:1/25/2016##naMe:COokIes;price:2.25;type:Food;expiration:3/22/2016##naMe:COOkieS;price:2.25;type:Food;expiration:1/25/2016##NAME:MilK;price:3.23;type:Food;expiration:1/17/2016##naMe:MilK;price:1.23;type:Food!expiration:4/25/2016##naMe:apPles;price:0.25;type:Food;expiration:1/23/2016##naMe:apPles;price:0.23;type:Food;expiration:5/02/2016##NAMe:BrEAD;price:1.23;type:Food;expiration:1/25/2016##naMe:;price:3.23;type:Food;expiration:1/04/2016##naMe:Milk;price:3.23;type:Food;expiration:1/25/2016##naME:BreaD;price:1.23;type:Food@expiration:1/02/2016##NAMe:BrEAD;price:1.23;type:Food@expiration:2/25/2016##naMe:MiLK;priCe:;type:Food;expiration:1/11/2016##naMe:Cookies;price:2.25;type:Food;expiration:1/25/2016##naMe:Co0kieS;pRice:2.25;type:Food;expiration:1/25/2016##naMe:COokIes;price:2.25;type:Food;expiration:3/22/2016##naMe:COOkieS;Price:2.25;type:Food;expiration:1/25/2016##NAME:MilK;price:3.23;type:Food;expiration:1/17/2016##naMe:MilK;priCe:;type:Food;expiration:4/25/2016##naMe:apPles;prIce:0.25;type:Food;expiration:1/23/2016##naMe:apPles;pRice:0.23;type:Food;expiration:5/02/2016##NAMe:BrEAD;price:1.23;type:Food;expiration:1/25/2016##naMe:;price:3.23;type:Food^expiration:1/04/2016##
+naMe:Milk;price:3.23;type:Food;expiration:1/25/2016##naME:BreaD;price:1.23;type:Food;expiration:1/02/2016##NAMe:BrEAD;price:1.23;type:Food;expiration:2/25/2016##naMe:MiLK;price:3.23;type:Food^expiration:1/11/2016##naMe:Cookies;price:2.25;type:Food%expiration:1/25/2016##naMe:CoOkieS;price:2.25;type:Food*expiration:1/25/2016##naMe:COokIes;price:2.25;type:Food;expiration:3/22/2016##naMe:COOkieS;price:2.25;type:Food;expiration:1/25/2016##NAME:MilK;price:3.23;type:Food;expiration:1/17/2016##naMe:MilK;price:1.23;type:Food!expiration:4/25/2016##naMe:apPles;price:0.25;type:Food;expiration:1/23/2016##naMe:apPles;price:0.23;type:Food;expiration:5/02/2016##NAMe:BrEAD;price:1.23;type:Food;expiration:1/25/2016##naMe:;price:3.23;type:Food;expiration:1/04/2016##naMe:Milk;price:3.23;type:Food;expiration:1/25/2016##naME:BreaD;price:1.23;type:Food@expiration:1/02/2016##NAMe:BrEAD;price:1.23;type:Food@expiration:2/25/2016##naMe:MiLK;priCe:;type:Food;expiration:1/11/2016##naMe:Cookies;price:2.25;type:Food;expiration:1/25/2016##naMe:Co0kieS;pRice:2.25;type:Food;expiration:1/25/2016##naMe:COokIes;price:2.25;type:Food;expiration:3/22/2016##naMe:COOkieS;Price:2.25;type:Food;expiration:1/25/2016##NAME:MilK;price:3.23;type:Food;expiration:1/17/2016##naMe:MilK;priCe:;type:Food;expiration:4/25/2016##naMe:apPles;prIce:0.25;type:Food;expiration:1/23/2016##naMe:apPles;pRice:0.23;type:Food;expiration:5/02/2016##NAMe:BrEAD;price:1.23;type:Food;expiration:1/25/2016##naMe:;price:3.23;type:Food^expiration:1/04/a2016##

src/test/java/io/zipcoder/ItemListGeneratorTest.java

@@ -0,0 +1,29 @@
+package io.zipcoder;
+
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ItemListGeneratorTest {
+
+//    @Test
+//    public void generateItemsTest(){
+//        String input = "naMe:Milk;price:3.23;type:Food;expiration:1/25/2016##";
+//        String expectedName = "Milk";
+//        Double expectedPrice = 1.23;
+//        String expectedType = "Food";
+//        String expirationDate = "1/25/2016";
+//        ItemParser itemParser = new ItemParser();
+//        ItemListGenerator itemListGenerator = new ItemListGenerator(itemParser);
+//
+//        Item actual = itemListGenerator.generateItems(input);
+//
+//        assertEquals(expectedName, actual.getName());
+//        assertEquals(expectedPrice, actual.getPrice());
+//        assertEquals(expectedType, actual.getType());
+//        assertEquals(expirationDate, actual.getExpiration());
+//
+//    }
+}

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

@@ -37,13 +37,13 @@ public class ItemParserTest {
     @Test
     public void parseStringIntoItemTest() throws ItemParseException{
         Item expected = new Item("milk", 3.23, "food","1/25/2016");
-        Item actual = itemParser.parseStringIntoItem(rawSingleItem);
+        Item actual = itemParser.parseStringIntoItem(rawMultipleItems);
         assertEquals(expected.toString(), actual.toString());
     }
 
     @Test(expected = ItemParseException.class)
     public void parseBrokenStringIntoItemTest() throws ItemParseException{
-        itemParser.parseStringIntoItem(rawBrokenSingleItem);
+        itemParser.parseStringIntoItem(rawSingleItem);
     }
 
     @Test
@@ -59,4 +59,50 @@ public class ItemParserTest {
         Integer actual = itemParser.findKeyValuePairsInRawItemData(rawSingleItemIrregularSeperatorSample).size();
         assertEquals(expected, actual);
     }
+
+    @Test
+    public void MyStringToItemTest() throws ItemParseException{
+        String item = "naMe:Milk;price:3.23;type:Food;expiration:1/25/2016";
+        String expected = "";
+        Item actual = itemParser.parseStringIntoItem(item);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void nameTest() throws ItemParseException {
+        //String name = "naMe:apples;price:3.23;type:Food;expiration:1/25/2016";
+        ArrayList<String> keyValuePairsInRawItemData = itemParser.findKeyValuePairsInRawItemData(rawMultipleItems);
+        String item = keyValuePairsInRawItemData.get(0);
+        String expected = "";
+        String actual = itemParser.name(item);
+        System.out.println(item);
+
+        Assert.assertEquals(expected , actual);
+    }
+
+    @Test
+    public void priceTest(){
+        Double expected = 3.23;
+        Double actual = itemParser.price(rawSingleItem);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void typeTest(){
+        String name = "naMe:apples;price:3.23;type:Food;expiration:1/25/2016";
+
+        //ArrayList<String> keyValuePairsInRawItemData = itemParser.findKeyValuePairsInRawItemData(name);
+        //String item = keyValuePairsInRawItemData.get(2);
+        String expected = "Fod";
+        String actual = itemParser.type(name);
+        System.out.println(actual);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void expirationTest(){
+        String expected = "";
+        String actual = itemParser.expiration(rawMultipleItems);
+        Assert.assertEquals(expected, actual);
+    }
 }