New Product Added

New product added, there was also a few small changes in the organizational structure of the US categories. Lastly, there was a small update to the country codes in the Readme

README.md

@@ -4,16 +4,16 @@
 ## Overview:
   This is a product API for grocery and item data. It will return information including prices, names, images descriptions, ids, nutrition information, and much more.
 
-  I built this API when I tried finding product data for a project, but couldn't find any that worked for my needs. The database is small and only contains 93 products, but new products are added every so often.
+  I built this API when I tried finding product data for a project, but couldn't find any that worked for my needs. The database is small and only contains 94 products, but new products are added every so often.
 
   Newly introduced was the idea of multiple countries. Now, this project will include data from multiple countries.
 
   ### By the Numbers:
-    * 93 total items
+    * 94 total items
     * 88 categories
-    * 67 different brands
+    * 68 different brands
     * 2 countries
-    * $236.82 worth of products
+    * $239.19 worth of products
     * 119,761 total calories*
 
     *some products may not be accounted for due to unreadable or incomplete nutritional information
@@ -53,9 +53,9 @@
   http://localhost:8080/docs            /*returns the docs for the routes*/
 
   --- Please Note ---
-  For the country parameter below, select one of the following (case sensitive):
-    - "United States"
-    - "Japan"
+  For the country parameter below (see masterList for all country codes), select one of the following (case sensitive):
+    - "US"
+    - "JP"
 
   http://localhost:8080/food/:country            /*returns all food data based on country provided*/
 
@@ -149,9 +149,6 @@
         * peanut-butter-crackers
       * cookies
         * chocolate-cookies
-      * chips
-        * corn-chip
-        * potato-chip
       * (flavors)
           * strawberry
           * chocolate
@@ -173,6 +170,9 @@
       * meat-alternative
       * snacks
         * popcorn
+        * chips
+          * corn-chip
+          * potato-chip
       * granola
       * bar
       * jar
@@ -204,8 +204,10 @@
         * matcha
         * peach
         * green-apple
+        * pizza
     * snacks
         * popcorn
+        * chips
     * breadsticks
 ```
 
@@ -300,6 +302,7 @@
     * Yaokin
     * Glico
       * Pocky
+    * Calbee
 ```
 
 </details>

data/Japan/data.json

@@ -168,5 +168,39 @@
             "protein": ""
         },
         "ingredients": "Concentrated Fruit Juice, Acidulant, Cellulose, Collagen, Fragrance, Glycerin, Potassium, Starch, Sugar, Vegetable Oil"
+    },
+    {
+        "name": "Calbee Spicy Pizza Potato",
+        "id": "Jfsc006",
+        "category": ["snacks", "chips", "pizza"],
+        "brand": "Calbee",
+        "weight": "65 grams",
+        "hot": false,
+        "cold": false,
+        "frozen": false,
+        "description": "Spicy Pizza Potato from Calbee is made with thick cut potato slices. It comes with rich emmental and cheddar cheese toppings, habanero and tomato sauce flavour. You can feel lumps of cheese into a crunchy snack at every snacking moment. ",
+        "price": {
+            "USD": {
+                "default": "2.37",
+                "formatted": "$2.37/each"
+            },
+            "JPY": {
+                "default": "238",
+                "formatted": "¥238/each"
+            }
+        },
+        "image": "http://localhost:8080/Japan/Jfsc006.jpg",
+        "nutrition": {
+            "serving size": "",
+            "servings per container": "",
+            "calories": "",
+            "fat": "",
+            "cholesterol": "",
+            "sodium": "",
+            "potassium": "",
+            "carbohydrates": "",
+            "protein": ""
+        },
+        "ingredients": "Concentrated Fruit Juice, Acidulant, Cellulose, Collagen, Fragrance, Glycerin, Potassium, Starch, Sugar, Vegetable Oil"
     }
 ]

data/Japan/masterList.txt

@@ -11,8 +11,10 @@ Categories:
     - matcha
     - peach
     - green-apple
+    - pizza
 - snacks
     - popcorn
+    - chips
 - breadsticks
 
 Brands:
@@ -21,6 +23,7 @@ Brands:
 - Yaokin
 - Glico
     - Pocky
+- Calbee
 
 Items:
 - KitKat Chocolate Orange*
@@ -31,6 +34,8 @@ Items:
 
 - Glico Pocky Matcha Chocolate
 
+- Calbee Spicy Pizza Potato**
+
 Due to language barriers, some products may not have complete nutritional information:
 *incomplete nutritional information
 **incomplete nutritional information and calories not logged in Readme Stats

data/Japan/statsTemplate.json

@@ -12,6 +12,8 @@
         "matcha": 0,
         "gummy": 0,
         "peach": 0,
-        "green-apple": 0
+        "green-apple": 0,
+        "chips": 0,
+        "pizza": 0
     }
 }

data/United States/masterList

@@ -48,9 +48,6 @@ Categories:
     - peanut-butter-crackers
 - cookies
     - chocolate-cookies
-- chips
-    - corn-chip
-    - potato-chip
 - (flavors)
     - strawberry
     - chocolate
@@ -64,14 +61,17 @@ Categories:
     - ravioli
     - meatballs
 - coffee
-- popcorn
 - breakfast
 - cereal
 - seasoning
 - vegan
 - vegetarian
 - meat-alternative
 - snacks
+    - popcorn
+    - chips
+        - corn-chip
+        - potato-chip
 - granola
 - bar
 - jar

data/masterList

@@ -55,9 +55,6 @@ Categories:
     - peanut-butter-crackers
 - cookies
     - chocolate-cookies
-- chips
-    - corn-chip
-    - potato-chip
 - (flavors)
     - strawberry
     - chocolate
@@ -83,6 +80,9 @@ Categories:
 - meat-alternative
 - snacks
     - popcorn
+    - chips
+        - corn-chip
+        - potato-chip
 - granola
 - bar
 - jar
@@ -164,6 +164,7 @@ Brands:
 - Glico
     - Pocky
 - Yaokin
+- Calbee
 
 Items:
 - apple
@@ -315,6 +316,8 @@ Items:
 - Yaokin Peach Gummy**
 - Yaokin Green Apple Gummy**
 
+- Calbee Spicy Pizza Potato**
+
 Due to language barriers, some products may not have complete nutritional information:
 *incomplete nutritional information
 **incomplete nutritional information and calories not logged in Readme Stats