diff --git a/docs/docs.go b/docs/docs.go index 77c05b2..93eadd3 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -351,12 +351,18 @@ const docTemplate = `{ "fructose_100g": { "type": "number" }, + "fruits-vegetables-legumes-estimate-from-ingredients_100g": { + "type": "number" + }, "fruits-vegetables-nuts": { "type": "number" }, "fruits-vegetables-nuts_100g": { "type": "number" }, + "galactose_100g": { + "type": "number" + }, "gamma-linolenic-acid": { "type": "number" }, @@ -477,6 +483,9 @@ const docTemplate = `{ "nervonic-acid_100g": { "type": "number" }, + "nova-group": { + "type": "number" + }, "nucleotides": { "type": "number" }, @@ -543,6 +552,9 @@ const docTemplate = `{ "phosphorus_100g": { "type": "number" }, + "phylloquinone_100g": { + "type": "number" + }, "polyols": { "type": "number" }, @@ -699,6 +711,9 @@ const docTemplate = `{ "vitamin-pp_100g": { "type": "number" }, + "water_100g": { + "type": "number" + }, "zinc": { "type": "number" }, @@ -902,12 +917,18 @@ const docTemplate = `{ "fructose_100g": { "type": "number" }, + "fruits-vegetables-legumes-estimate-from-ingredients_100g": { + "type": "number" + }, "fruits-vegetables-nuts": { "type": "number" }, "fruits-vegetables-nuts_100g": { "type": "number" }, + "galactose_100g": { + "type": "number" + }, "gamma-linolenic-acid": { "type": "number" }, @@ -1028,6 +1049,9 @@ const docTemplate = `{ "nervonic-acid_100g": { "type": "number" }, + "nova-group": { + "type": "number" + }, "nucleotides": { "type": "number" }, @@ -1094,6 +1118,9 @@ const docTemplate = `{ "phosphorus_100g": { "type": "number" }, + "phylloquinone_100g": { + "type": "number" + }, "polyols": { "type": "number" }, @@ -1250,6 +1277,9 @@ const docTemplate = `{ "vitamin-pp_100g": { "type": "number" }, + "water_100g": { + "type": "number" + }, "zinc": { "type": "number" }, diff --git a/docs/swagger.json b/docs/swagger.json index 6705869..e3227f9 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -344,12 +344,18 @@ "fructose_100g": { "type": "number" }, + "fruits-vegetables-legumes-estimate-from-ingredients_100g": { + "type": "number" + }, "fruits-vegetables-nuts": { "type": "number" }, "fruits-vegetables-nuts_100g": { "type": "number" }, + "galactose_100g": { + "type": "number" + }, "gamma-linolenic-acid": { "type": "number" }, @@ -470,6 +476,9 @@ "nervonic-acid_100g": { "type": "number" }, + "nova-group": { + "type": "number" + }, "nucleotides": { "type": "number" }, @@ -536,6 +545,9 @@ "phosphorus_100g": { "type": "number" }, + "phylloquinone_100g": { + "type": "number" + }, "polyols": { "type": "number" }, @@ -692,6 +704,9 @@ "vitamin-pp_100g": { "type": "number" }, + "water_100g": { + "type": "number" + }, "zinc": { "type": "number" }, @@ -895,12 +910,18 @@ "fructose_100g": { "type": "number" }, + "fruits-vegetables-legumes-estimate-from-ingredients_100g": { + "type": "number" + }, "fruits-vegetables-nuts": { "type": "number" }, "fruits-vegetables-nuts_100g": { "type": "number" }, + "galactose_100g": { + "type": "number" + }, "gamma-linolenic-acid": { "type": "number" }, @@ -1021,6 +1042,9 @@ "nervonic-acid_100g": { "type": "number" }, + "nova-group": { + "type": "number" + }, "nucleotides": { "type": "number" }, @@ -1087,6 +1111,9 @@ "phosphorus_100g": { "type": "number" }, + "phylloquinone_100g": { + "type": "number" + }, "polyols": { "type": "number" }, @@ -1243,6 +1270,9 @@ "vitamin-pp_100g": { "type": "number" }, + "water_100g": { + "type": "number" + }, "zinc": { "type": "number" }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index c11e824..44a8ad2 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -141,10 +141,14 @@ definitions: type: number fructose_100g: type: number + fruits-vegetables-legumes-estimate-from-ingredients_100g: + type: number fruits-vegetables-nuts: type: number fruits-vegetables-nuts_100g: type: number + galactose_100g: + type: number gamma-linolenic-acid: type: number gamma-linolenic-acid_100g: @@ -225,6 +229,8 @@ definitions: type: number nervonic-acid_100g: type: number + nova-group: + type: number nucleotides: type: number nucleotides_100g: @@ -269,6 +275,8 @@ definitions: type: number phosphorus_100g: type: number + phylloquinone_100g: + type: number polyols: type: number polyols_100g: @@ -373,6 +381,8 @@ definitions: type: number vitamin-pp_100g: type: number + water_100g: + type: number zinc: type: number zinc_100g: @@ -508,10 +518,14 @@ definitions: type: number fructose_100g: type: number + fruits-vegetables-legumes-estimate-from-ingredients_100g: + type: number fruits-vegetables-nuts: type: number fruits-vegetables-nuts_100g: type: number + galactose_100g: + type: number gamma-linolenic-acid: type: number gamma-linolenic-acid_100g: @@ -592,6 +606,8 @@ definitions: type: number nervonic-acid_100g: type: number + nova-group: + type: number nucleotides: type: number nucleotides_100g: @@ -636,6 +652,8 @@ definitions: type: number phosphorus_100g: type: number + phylloquinone_100g: + type: number polyols: type: number polyols_100g: @@ -740,6 +758,8 @@ definitions: type: number vitamin-pp_100g: type: number + water_100g: + type: number zinc: type: number zinc_100g: diff --git a/internal/database/product/product.go b/internal/database/product/product.go index 1d88be6..c3d2e9c 100644 --- a/internal/database/product/product.go +++ b/internal/database/product/product.go @@ -188,6 +188,12 @@ type Product struct { NutritionScoreFr float64 `json:"nutrition-score-fr" bson:"nutrition-score-fr"` NutritionScoreUk100g float64 `json:"nutrition-score-uk_100g" bson:"nutrition-score-uk_100g"` NutritionScoreUk float64 `json:"nutrition-score-uk" bson:"nutrition-score-uk"` + + FruitsVegetablesLegumesEstimateFromIngredients100g float64 `json:"fruits-vegetables-legumes-estimate-from-ingredients_100g" bson:"fruits-vegetables-legumes-estimate-from-ingredients_100g,truncate"` + Galactose_100g float64 `json:"galactose_100g" bson:"galactose_100g"` + NovaGroup float64 `json:"nova-group" bson:"nova-group,truncate"` + Phylloquinone_100g float64 `json:"phylloquinone_100g" bson:"phylloquinone_100g"` + Water_100g float64 `json:"water_100g" bson:"water_100g"` } NutrimentsEstimated struct { Energy100g float64 `json:"energy_100g" bson:"energy_100g"` @@ -372,5 +378,11 @@ type Product struct { NutritionScoreFr float64 `json:"nutrition-score-fr" bson:"nutrition-score-fr"` NutritionScoreUk100g float64 `json:"nutrition-score-uk_100g" bson:"nutrition-score-uk_100g"` NutritionScoreUk float64 `json:"nutrition-score-uk" bson:"nutrition-score-uk"` + + FruitsVegetablesLegumesEstimateFromIngredients100g float64 `json:"fruits-vegetables-legumes-estimate-from-ingredients_100g" bson:"fruits-vegetables-legumes-estimate-from-ingredients_100g,truncate"` + Galactose_100g float64 `json:"galactose_100g" bson:"galactose_100g"` + NovaGroup float64 `json:"nova-group" bson:"nova-group,truncate"` + Phylloquinone_100g float64 `json:"phylloquinone_100g" bson:"phylloquinone_100g"` + Water_100g float64 `json:"water_100g" bson:"water_100g"` } `json:"nutriments_estimated" bson:"nutriments_estimated"` }