update calories

calories/calories.go

@@ -6,20 +6,32 @@ import (
 )
 
 var (
-	caloriesMap = map[string]int{
-		"чай":    79,
-		"яблоко": 100,
+	productsMap = map[string]struct {
+		caloriesIn100G int
+		awgWeightG     int
+	}{
+		"чай":    {caloriesIn100G: 65, awgWeightG: 200},
+		"яблоко": {caloriesIn100G: 52, awgWeightG: 242},
+		"хлеб":   {caloriesIn100G: 245, awgWeightG: 35},
 	}
 )
 
 func CalcCalories(text string) (int, error) {
-	count, ok := caloriesMap[strings.ToLower(text)]
+	product, ok := productsMap[strings.ToLower(text)]
 	if ok {
-		return count, nil
+		return product.caloriesIn100G * product.awgWeightG / 100, nil
 	}
 	arr := strings.Split(text, " ")
 	if len(arr) == 2 {
-		coun1, err := strconv.Atoi(arr[0])
+		product, ok := productsMap[strings.ToLower(arr[0])]
+		if ok {
+			count, err := strconv.Atoi(arr[1])
+			if err != nil {
+				return 0, nil
+			}
+			return product.caloriesIn100G * count / 100, nil
+		}
+		count1, err := strconv.Atoi(arr[0])
 		if err != nil {
 			return 0, nil
 		}
@@ -27,7 +39,7 @@ func CalcCalories(text string) (int, error) {
 		if err != nil {
 			return 0, nil
 		}
-		return coun1 * count2 / 100, nil
+		return count1 * count2 / 100, nil
 	}
 	count, err := strconv.Atoi(text)
 	if err != nil {

calories/calories_test.go

@@ -34,7 +34,13 @@ func TestCalcCalories(t *testing.T) {
 		{
 			"чай text",
 			"чай",
-			79,
+			130,
+			false,
+		},
+		{
+			"чай 250 text",
+			"чай 250",
+			162,
 			false,
 		},
 	}
@@ -49,6 +55,7 @@ func TestCalcCalories(t *testing.T) {
 				return
 			}
 			if count != tt.want {
+				fmt.Println(count, tt.want)
 				fmt.Println(count, tt.want)
 				t.Errorf("error count: %v", err)
 				return