diff --git a/cookbook/helper/food_property_helper.py b/cookbook/helper/food_property_helper.py index 1bed81c0a..7bf95f0ed 100644 --- a/cookbook/helper/food_property_helper.py +++ b/cookbook/helper/food_property_helper.py @@ -25,7 +25,7 @@ class FoodPropertyHelper: ingredients += s.ingredients.all() for fpt in property_types: # TODO is this safe or should I require the request context? - computed_properties[fpt.id] = {'name': fpt.name, 'food_values': {}, 'total_value': 0} + computed_properties[fpt.id] = {'id': fpt.id, 'name': fpt.name, 'icon': fpt.icon, 'description': fpt.description, 'unit': fpt.unit, 'food_values': {}, 'total_value': 0} # TODO unit conversion support @@ -34,18 +34,18 @@ class FoodPropertyHelper: p = i.food.foodproperty_set.filter(space=self.space, property_type=pt).first() if p: computed_properties[p.property_type.id]['total_value'] += (i.amount / p.food_amount) * p.property_amount - computed_properties[p.property_type.id]['food_values'] = self.add_or_create(computed_properties[p.property_type.id]['food_values'], i.food.id, (i.amount / p.food_amount) * p.property_amount) + computed_properties[p.property_type.id]['food_values'] = self.add_or_create(computed_properties[p.property_type.id]['food_values'], i.food.id, (i.amount / p.food_amount) * p.property_amount, i.food) else: - computed_properties[pt.id]['food_values'][i.food.id] = None + computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0} return computed_properties # small dict helper to add to existing key or create new, probably a better way of doing this # TODO move to central helper ? @staticmethod - def add_or_create(d, key, value): + def add_or_create(d, key, value, food): if key in d: - d[key] += value + d[key]['value'] += value else: - d[key] = value + d[key] = {'id': food.id, 'food': food.name, 'value': value} return d diff --git a/cookbook/serializer.py b/cookbook/serializer.py index f94f68c7a..1aea41051 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -22,9 +22,10 @@ from rest_framework.exceptions import NotFound, ValidationError from cookbook.helper.CustomStorageClass import CachedS3Boto3Storage from cookbook.helper.HelperFunctions import str2bool +from cookbook.helper.food_property_helper import FoodPropertyHelper from cookbook.helper.permission_helper import above_space_limit from cookbook.helper.shopping_helper import RecipeShoppingEditor -from cookbook.helper.unit_conversion_helper import get_conversions +from cookbook.helper.unit_conversion_helper import UnitConversionHelper from cookbook.models import (Automation, BookmarkletImport, Comment, CookLog, CustomFilter, ExportLog, Food, FoodInheritField, ImportLog, Ingredient, InviteLink, Keyword, MealPlan, MealType, NutritionInformation, Recipe, RecipeBook, @@ -637,7 +638,6 @@ class IngredientSimpleSerializer(WritableNestedModelSerializer): used_in_recipes = serializers.SerializerMethodField('get_used_in_recipes') amount = CustomDecimalField() conversions = serializers.SerializerMethodField('get_conversions') - nutritions = serializers.SerializerMethodField('get_nutritions') def get_used_in_recipes(self, obj): used_in = [] @@ -647,27 +647,14 @@ class IngredientSimpleSerializer(WritableNestedModelSerializer): return used_in def get_conversions(self, obj): - conversions = [] - # TODO add hardcoded base conversions for metric/imperial if obj.unit and obj.food: - conversions += get_conversions(obj.amount, obj.unit, obj.food) - - return conversions - - def get_nutritions(self, ingredient): - nutritions = {} - - if ingredient.food: - for fn in ingredient.food.foodnutrition_set.all(): - if fn.food_unit == ingredient.unit: - nutritions[fn.property_type.id] = ingredient.amount / fn.food_amount * fn.property_amount - else: - conversions = self.get_conversions(ingredient) - for c in conversions: - if fn.food_unit.id == c['unit']['id']: - nutritions[fn.property_type.id] = c['amount'] / fn.food_amount * fn.property_amount - - return nutritions + uch = UnitConversionHelper(self.context['request'].space) + conversions = [] + for c in uch.get_conversions(obj): + conversions.append({'food': c.food.name, 'unit': c.unit.name , 'amount': c.amount}) # TODO do formatting in helper + return conversions + else: + return [] def create(self, validated_data): validated_data['space'] = self.context['request'].space @@ -680,10 +667,11 @@ class IngredientSimpleSerializer(WritableNestedModelSerializer): class Meta: model = Ingredient fields = ( - 'id', 'food', 'unit', 'amount', 'nutritions', 'conversions', 'note', 'order', + 'id', 'food', 'unit', 'amount', 'conversions', 'note', 'order', 'is_header', 'no_amount', 'original_text', 'used_in_recipes', 'always_use_plural_unit', 'always_use_plural_food', ) + read_only_fields = ['conversions', ] class IngredientSerializer(IngredientSimpleSerializer): @@ -817,17 +805,22 @@ class RecipeSerializer(RecipeBaseSerializer): shared = UserSerializer(many=True, required=False) rating = CustomDecimalField(required=False, allow_null=True, read_only=True) last_cooked = serializers.DateTimeField(required=False, allow_null=True, read_only=True) + food_properties = serializers.SerializerMethodField('get_food_properties') + + def get_food_properties(self, obj): + fph = FoodPropertyHelper(self.context['request'].space) + return fph.calculate_recipe_properties(obj) class Meta: model = Recipe fields = ( 'id', 'name', 'description', 'image', 'keywords', 'steps', 'working_time', 'waiting_time', 'created_by', 'created_at', 'updated_at', 'source_url', - 'internal', 'show_ingredient_overview', 'nutrition', 'servings', 'file_path', 'servings_text', 'rating', + 'internal', 'show_ingredient_overview', 'nutrition', 'food_properties', 'servings', 'file_path', 'servings_text', 'rating', 'last_cooked', 'private', 'shared', ) - read_only_fields = ['image', 'created_by', 'created_at'] + read_only_fields = ['image', 'created_by', 'created_at', 'food_properties'] def validate(self, data): above_limit, msg = above_space_limit(self.context['request'].space) @@ -959,11 +952,11 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer): value = value.quantize( Decimal(1)) if value == value.to_integral() else value.normalize() # strips trailing zero return ( - obj.name - or getattr(obj.mealplan, 'title', None) - or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)]) - or obj.recipe.name - ) + f' ({value:.2g})' + obj.name + or getattr(obj.mealplan, 'title', None) + or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)]) + or obj.recipe.name + ) + f' ({value:.2g})' def update(self, instance, validated_data): # TODO remove once old shopping list diff --git a/vue/src/apps/TestView/TestView.vue b/vue/src/apps/TestView/TestView.vue index 4f780be6b..a23517f48 100644 --- a/vue/src/apps/TestView/TestView.vue +++ b/vue/src/apps/TestView/TestView.vue @@ -1,102 +1,37 @@ @@ -108,9 +43,8 @@ import {BootstrapVue} from "bootstrap-vue" import "bootstrap-vue/dist/bootstrap-vue.css" import {ApiApiFactory} from "@/utils/openapi/api"; -import RecipeCard from "@/components/RecipeCard.vue"; -import GenericMultiselect from "@/components/GenericMultiselect.vue"; -import {ApiMixin, StandardToasts} from "@/utils/utils"; + +import {ApiMixin} from "@/utils/utils"; Vue.use(BootstrapVue) @@ -119,34 +53,22 @@ Vue.use(BootstrapVue) export default { name: "TestView", mixins: [ApiMixin], - components: { - GenericMultiselect - }, + components: {}, data() { return { - food: undefined, + recipe: undefined, } }, mounted() { this.$i18n.locale = window.CUSTOM_LOCALE let apiClient = new ApiApiFactory() - apiClient.retrieveFood('1').then((r) => { - this.food = r.data + apiClient.retrieveRecipe('1').then((r) => { + this.recipe = r.data }) }, - methods: { - updateFood: function () { - let apiClient = new ApiApiFactory() - apiClient.updateFood(this.food.id, this.food).then((r) => { - this.food = r.data - StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE) - }).catch(err => { - StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err) - }) - } - }, + methods: {}, } diff --git a/vue/src/apps/TestView/TestViewBackup.vue b/vue/src/apps/TestView/TestViewBackup.vue new file mode 100644 index 000000000..4f780be6b --- /dev/null +++ b/vue/src/apps/TestView/TestViewBackup.vue @@ -0,0 +1,155 @@ + + + + + + diff --git a/vue/src/utils/openapi/api.ts b/vue/src/utils/openapi/api.ts index 4b85b6163..3f058ec07 100644 --- a/vue/src/utils/openapi/api.ts +++ b/vue/src/utils/openapi/api.ts @@ -878,12 +878,6 @@ export interface Ingredient { * @memberof Ingredient */ amount: string; - /** - * - * @type {string} - * @memberof Ingredient - */ - nutritions?: string; /** * * @type {string} @@ -2048,6 +2042,12 @@ export interface Recipe { * @memberof Recipe */ nutrition?: RecipeNutrition | null; + /** + * + * @type {string} + * @memberof Recipe + */ + food_properties?: string; /** * * @type {number} @@ -2294,12 +2294,6 @@ export interface RecipeIngredients { * @memberof RecipeIngredients */ amount: string; - /** - * - * @type {string} - * @memberof RecipeIngredients - */ - nutritions?: string; /** * * @type {string} @@ -3710,7 +3704,7 @@ export interface UnitConversion { * @type {string} * @memberof UnitConversion */ - base_amount?: string; + base_amount: string; /** * * @type {UnitConversionBaseUnit} @@ -3722,7 +3716,7 @@ export interface UnitConversion { * @type {string} * @memberof UnitConversion */ - converted_amount?: string; + converted_amount: string; /** * * @type {UnitConversionBaseUnit} @@ -4364,6 +4358,39 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) options: localVarRequestOptions, }; }, + /** + * + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + createFoodPropertyType: async (nutritionType?: NutritionType, options: any = {}): Promise => { + const localVarPath = `/api/nutrition-type/`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + + localVarHeaderParameter['Content-Type'] = 'application/json'; + + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + localVarRequestOptions.data = serializeDataIfNeeded(nutritionType, localVarRequestOptions, configuration) + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, /** * * @param {ImportLog} [importLog] @@ -4562,39 +4589,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) options: localVarRequestOptions, }; }, - /** - * - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - createNutritionType: async (nutritionType?: NutritionType, options: any = {}): Promise => { - const localVarPath = `/api/nutrition-type/`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - - localVarHeaderParameter['Content-Type'] = 'application/json'; - - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(nutritionType, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, /** * * @param {Recipe} [recipe] @@ -5445,6 +5439,39 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + destroyFoodPropertyType: async (id: string, options: any = {}): Promise => { + // verify required parameter 'id' is not null or undefined + assertParamExists('destroyFoodPropertyType', 'id', id) + const localVarPath = `/api/nutrition-type/{id}/` + .replace(`{${"id"}}`, encodeURIComponent(String(id))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -5643,39 +5670,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - destroyNutritionType: async (id: string, options: any = {}): Promise => { - // verify required parameter 'id' is not null or undefined - assertParamExists('destroyNutritionType', 'id', id) - const localVarPath = `/api/nutrition-type/{id}/` - .replace(`{${"id"}}`, encodeURIComponent(String(id))); - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -6507,6 +6501,35 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + listFoodPropertyTypes: async (options: any = {}): Promise => { + const localVarPath = `/api/nutrition-type/`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -6809,35 +6832,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - listNutritionTypes: async (options: any = {}): Promise => { - const localVarPath = `/api/nutrition-type/`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -8179,6 +8173,43 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) options: localVarRequestOptions, }; }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + partialUpdateFoodPropertyType: async (id: string, nutritionType?: NutritionType, options: any = {}): Promise => { + // verify required parameter 'id' is not null or undefined + assertParamExists('partialUpdateFoodPropertyType', 'id', id) + const localVarPath = `/api/nutrition-type/{id}/` + .replace(`{${"id"}}`, encodeURIComponent(String(id))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + + localVarHeaderParameter['Content-Type'] = 'application/json'; + + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + localVarRequestOptions.data = serializeDataIfNeeded(nutritionType, localVarRequestOptions, configuration) + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, /** * * @param {string} id A unique integer value identifying this import log. @@ -8401,43 +8432,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) options: localVarRequestOptions, }; }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - partialUpdateNutritionType: async (id: string, nutritionType?: NutritionType, options: any = {}): Promise => { - // verify required parameter 'id' is not null or undefined - assertParamExists('partialUpdateNutritionType', 'id', id) - const localVarPath = `/api/nutrition-type/{id}/` - .replace(`{${"id"}}`, encodeURIComponent(String(id))); - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - - localVarHeaderParameter['Content-Type'] = 'application/json'; - - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(nutritionType, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, /** * * @param {string} id A unique integer value identifying this recipe. @@ -9500,6 +9494,39 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + retrieveFoodPropertyType: async (id: string, options: any = {}): Promise => { + // verify required parameter 'id' is not null or undefined + assertParamExists('retrieveFoodPropertyType', 'id', id) + const localVarPath = `/api/nutrition-type/{id}/` + .replace(`{${"id"}}`, encodeURIComponent(String(id))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -9731,39 +9758,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - retrieveNutritionType: async (id: string, options: any = {}): Promise => { - // verify required parameter 'id' is not null or undefined - assertParamExists('retrieveNutritionType', 'id', id) - const localVarPath = `/api/nutrition-type/{id}/` - .replace(`{${"id"}}`, encodeURIComponent(String(id))); - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -10490,6 +10484,39 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @param {string} id + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + retrieveshareLink: async (id: string, options: any = {}): Promise => { + // verify required parameter 'id' is not null or undefined + assertParamExists('retrieveshareLink', 'id', id) + const localVarPath = `/api/share-link/{id}` + .replace(`{${"id"}}`, encodeURIComponent(String(id))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -10865,6 +10892,43 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) options: localVarRequestOptions, }; }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + updateFoodPropertyType: async (id: string, nutritionType?: NutritionType, options: any = {}): Promise => { + // verify required parameter 'id' is not null or undefined + assertParamExists('updateFoodPropertyType', 'id', id) + const localVarPath = `/api/nutrition-type/{id}/` + .replace(`{${"id"}}`, encodeURIComponent(String(id))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + + localVarHeaderParameter['Content-Type'] = 'application/json'; + + setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + localVarRequestOptions.data = serializeDataIfNeeded(nutritionType, localVarRequestOptions, configuration) + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, /** * * @param {string} id A unique integer value identifying this import log. @@ -11087,43 +11151,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration) options: localVarRequestOptions, }; }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - updateNutritionType: async (id: string, nutritionType?: NutritionType, options: any = {}): Promise => { - // verify required parameter 'id' is not null or undefined - assertParamExists('updateNutritionType', 'id', id) - const localVarPath = `/api/nutrition-type/{id}/` - .replace(`{${"id"}}`, encodeURIComponent(String(id))); - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - - localVarHeaderParameter['Content-Type'] = 'application/json'; - - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(nutritionType, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, /** * * @param {string} id A unique integer value identifying this recipe. @@ -11830,6 +11857,16 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.createFood(food, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async createFoodPropertyType(nutritionType?: NutritionType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.createFoodPropertyType(nutritionType, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * * @param {ImportLog} [importLog] @@ -11890,16 +11927,6 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.createMealType(mealType, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, - /** - * - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async createNutritionType(nutritionType?: NutritionType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.createNutritionType(nutritionType, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {Recipe} [recipe] @@ -12155,6 +12182,16 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.destroyFood(id, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async destroyFoodPropertyType(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.destroyFoodPropertyType(id, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * * @param {string} id A unique integer value identifying this import log. @@ -12215,16 +12252,6 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.destroyMealType(id, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async destroyNutritionType(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.destroyNutritionType(id, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {string} id A unique integer value identifying this recipe. @@ -12474,6 +12501,15 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.listFoodInheritFields(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async listFoodPropertyTypes(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.listFoodPropertyTypes(options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * * @param {string} [query] Query string matched against food name. @@ -12560,15 +12596,6 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.listMealTypes(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async listNutritionTypes(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.listNutritionTypes(options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * optional parameters - **recipe**: id of recipe - only return books for that recipe - **book**: id of book - only return recipes in that book * @param {*} [options] Override http request option. @@ -12950,6 +12977,17 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateFood(id, food, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async partialUpdateFoodPropertyType(id: string, nutritionType?: NutritionType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateFoodPropertyType(id, nutritionType, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * * @param {string} id A unique integer value identifying this import log. @@ -13016,17 +13054,6 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateMealType(id, mealType, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async partialUpdateNutritionType(id: string, nutritionType?: NutritionType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateNutritionType(id, nutritionType, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {string} id A unique integer value identifying this recipe. @@ -13342,6 +13369,16 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveFoodInheritField(id, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async retrieveFoodPropertyType(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveFoodPropertyType(id, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * * @param {string} id A unique integer value identifying this group. @@ -13412,16 +13449,6 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveMealType(id, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async retrieveNutritionType(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveNutritionType(id, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {string} id A unique integer value identifying this recipe. @@ -13642,6 +13669,16 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.retrievedownloadFile(fileId, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {string} id + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async retrieveshareLink(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveshareLink(id, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * api endpoint to switch space function * @param {string} spaceId @@ -13751,6 +13788,17 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.updateFood(id, food, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async updateFoodPropertyType(id: string, nutritionType?: NutritionType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.updateFoodPropertyType(id, nutritionType, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * * @param {string} id A unique integer value identifying this import log. @@ -13817,17 +13865,6 @@ export const ApiApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.updateMealType(id, mealType, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async updateNutritionType(id: string, nutritionType?: NutritionType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.updateNutritionType(id, nutritionType, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {string} id A unique integer value identifying this recipe. @@ -14082,6 +14119,15 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: createFood(food?: Food, options?: any): AxiosPromise { return localVarFp.createFood(food, options).then((request) => request(axios, basePath)); }, + /** + * + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + createFoodPropertyType(nutritionType?: NutritionType, options?: any): AxiosPromise { + return localVarFp.createFoodPropertyType(nutritionType, options).then((request) => request(axios, basePath)); + }, /** * * @param {ImportLog} [importLog] @@ -14136,15 +14182,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: createMealType(mealType?: MealType, options?: any): AxiosPromise { return localVarFp.createMealType(mealType, options).then((request) => request(axios, basePath)); }, - /** - * - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - createNutritionType(nutritionType?: NutritionType, options?: any): AxiosPromise { - return localVarFp.createNutritionType(nutritionType, options).then((request) => request(axios, basePath)); - }, /** * * @param {Recipe} [recipe] @@ -14375,6 +14412,15 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: destroyFood(id: string, options?: any): AxiosPromise { return localVarFp.destroyFood(id, options).then((request) => request(axios, basePath)); }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + destroyFoodPropertyType(id: string, options?: any): AxiosPromise { + return localVarFp.destroyFoodPropertyType(id, options).then((request) => request(axios, basePath)); + }, /** * * @param {string} id A unique integer value identifying this import log. @@ -14429,15 +14475,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: destroyMealType(id: string, options?: any): AxiosPromise { return localVarFp.destroyMealType(id, options).then((request) => request(axios, basePath)); }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - destroyNutritionType(id: string, options?: any): AxiosPromise { - return localVarFp.destroyNutritionType(id, options).then((request) => request(axios, basePath)); - }, /** * * @param {string} id A unique integer value identifying this recipe. @@ -14662,6 +14699,14 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: listFoodInheritFields(options?: any): AxiosPromise> { return localVarFp.listFoodInheritFields(options).then((request) => request(axios, basePath)); }, + /** + * + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + listFoodPropertyTypes(options?: any): AxiosPromise> { + return localVarFp.listFoodPropertyTypes(options).then((request) => request(axios, basePath)); + }, /** * * @param {string} [query] Query string matched against food name. @@ -14740,14 +14785,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: listMealTypes(options?: any): AxiosPromise> { return localVarFp.listMealTypes(options).then((request) => request(axios, basePath)); }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - listNutritionTypes(options?: any): AxiosPromise> { - return localVarFp.listNutritionTypes(options).then((request) => request(axios, basePath)); - }, /** * optional parameters - **recipe**: id of recipe - only return books for that recipe - **book**: id of book - only return recipes in that book * @param {*} [options] Override http request option. @@ -15095,6 +15132,16 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: partialUpdateFood(id: string, food?: Food, options?: any): AxiosPromise { return localVarFp.partialUpdateFood(id, food, options).then((request) => request(axios, basePath)); }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + partialUpdateFoodPropertyType(id: string, nutritionType?: NutritionType, options?: any): AxiosPromise { + return localVarFp.partialUpdateFoodPropertyType(id, nutritionType, options).then((request) => request(axios, basePath)); + }, /** * * @param {string} id A unique integer value identifying this import log. @@ -15155,16 +15202,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: partialUpdateMealType(id: string, mealType?: MealType, options?: any): AxiosPromise { return localVarFp.partialUpdateMealType(id, mealType, options).then((request) => request(axios, basePath)); }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - partialUpdateNutritionType(id: string, nutritionType?: NutritionType, options?: any): AxiosPromise { - return localVarFp.partialUpdateNutritionType(id, nutritionType, options).then((request) => request(axios, basePath)); - }, /** * * @param {string} id A unique integer value identifying this recipe. @@ -15451,6 +15488,15 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: retrieveFoodInheritField(id: string, options?: any): AxiosPromise { return localVarFp.retrieveFoodInheritField(id, options).then((request) => request(axios, basePath)); }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + retrieveFoodPropertyType(id: string, options?: any): AxiosPromise { + return localVarFp.retrieveFoodPropertyType(id, options).then((request) => request(axios, basePath)); + }, /** * * @param {string} id A unique integer value identifying this group. @@ -15514,15 +15560,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: retrieveMealType(id: string, options?: any): AxiosPromise { return localVarFp.retrieveMealType(id, options).then((request) => request(axios, basePath)); }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - retrieveNutritionType(id: string, options?: any): AxiosPromise { - return localVarFp.retrieveNutritionType(id, options).then((request) => request(axios, basePath)); - }, /** * * @param {string} id A unique integer value identifying this recipe. @@ -15721,6 +15758,15 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: retrievedownloadFile(fileId: string, options?: any): AxiosPromise { return localVarFp.retrievedownloadFile(fileId, options).then((request) => request(axios, basePath)); }, + /** + * + * @param {string} id + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + retrieveshareLink(id: string, options?: any): AxiosPromise { + return localVarFp.retrieveshareLink(id, options).then((request) => request(axios, basePath)); + }, /** * api endpoint to switch space function * @param {string} spaceId @@ -15820,6 +15866,16 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: updateFood(id: string, food?: Food, options?: any): AxiosPromise { return localVarFp.updateFood(id, food, options).then((request) => request(axios, basePath)); }, + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + updateFoodPropertyType(id: string, nutritionType?: NutritionType, options?: any): AxiosPromise { + return localVarFp.updateFoodPropertyType(id, nutritionType, options).then((request) => request(axios, basePath)); + }, /** * * @param {string} id A unique integer value identifying this import log. @@ -15880,16 +15936,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?: updateMealType(id: string, mealType?: MealType, options?: any): AxiosPromise { return localVarFp.updateMealType(id, mealType, options).then((request) => request(axios, basePath)); }, - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - updateNutritionType(id: string, nutritionType?: NutritionType, options?: any): AxiosPromise { - return localVarFp.updateNutritionType(id, nutritionType, options).then((request) => request(axios, basePath)); - }, /** * * @param {string} id A unique integer value identifying this recipe. @@ -16142,6 +16188,17 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).createFood(food, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof ApiApi + */ + public createFoodPropertyType(nutritionType?: NutritionType, options?: any) { + return ApiApiFp(this.configuration).createFoodPropertyType(nutritionType, options).then((request) => request(this.axios, this.basePath)); + } + /** * * @param {ImportLog} [importLog] @@ -16208,17 +16265,6 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).createMealType(mealType, options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof ApiApi - */ - public createNutritionType(nutritionType?: NutritionType, options?: any) { - return ApiApiFp(this.configuration).createNutritionType(nutritionType, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {Recipe} [recipe] @@ -16499,6 +16545,17 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).destroyFood(id, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof ApiApi + */ + public destroyFoodPropertyType(id: string, options?: any) { + return ApiApiFp(this.configuration).destroyFoodPropertyType(id, options).then((request) => request(this.axios, this.basePath)); + } + /** * * @param {string} id A unique integer value identifying this import log. @@ -16565,17 +16622,6 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).destroyMealType(id, options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof ApiApi - */ - public destroyNutritionType(id: string, options?: any) { - return ApiApiFp(this.configuration).destroyNutritionType(id, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {string} id A unique integer value identifying this recipe. @@ -16850,6 +16896,16 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).listFoodInheritFields(options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof ApiApi + */ + public listFoodPropertyTypes(options?: any) { + return ApiApiFp(this.configuration).listFoodPropertyTypes(options).then((request) => request(this.axios, this.basePath)); + } + /** * * @param {string} [query] Query string matched against food name. @@ -16944,16 +17000,6 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).listMealTypes(options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof ApiApi - */ - public listNutritionTypes(options?: any) { - return ApiApiFp(this.configuration).listNutritionTypes(options).then((request) => request(this.axios, this.basePath)); - } - /** * optional parameters - **recipe**: id of recipe - only return books for that recipe - **book**: id of book - only return recipes in that book * @param {*} [options] Override http request option. @@ -17369,6 +17415,18 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).partialUpdateFood(id, food, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof ApiApi + */ + public partialUpdateFoodPropertyType(id: string, nutritionType?: NutritionType, options?: any) { + return ApiApiFp(this.configuration).partialUpdateFoodPropertyType(id, nutritionType, options).then((request) => request(this.axios, this.basePath)); + } + /** * * @param {string} id A unique integer value identifying this import log. @@ -17441,18 +17499,6 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).partialUpdateMealType(id, mealType, options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof ApiApi - */ - public partialUpdateNutritionType(id: string, nutritionType?: NutritionType, options?: any) { - return ApiApiFp(this.configuration).partialUpdateNutritionType(id, nutritionType, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {string} id A unique integer value identifying this recipe. @@ -17797,6 +17843,17 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).retrieveFoodInheritField(id, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof ApiApi + */ + public retrieveFoodPropertyType(id: string, options?: any) { + return ApiApiFp(this.configuration).retrieveFoodPropertyType(id, options).then((request) => request(this.axios, this.basePath)); + } + /** * * @param {string} id A unique integer value identifying this group. @@ -17874,17 +17931,6 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).retrieveMealType(id, options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof ApiApi - */ - public retrieveNutritionType(id: string, options?: any) { - return ApiApiFp(this.configuration).retrieveNutritionType(id, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {string} id A unique integer value identifying this recipe. @@ -18127,6 +18173,17 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).retrievedownloadFile(fileId, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {string} id + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof ApiApi + */ + public retrieveshareLink(id: string, options?: any) { + return ApiApiFp(this.configuration).retrieveshareLink(id, options).then((request) => request(this.axios, this.basePath)); + } + /** * api endpoint to switch space function * @param {string} spaceId @@ -18246,6 +18303,18 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).updateFood(id, food, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {string} id A unique integer value identifying this food property type. + * @param {NutritionType} [nutritionType] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof ApiApi + */ + public updateFoodPropertyType(id: string, nutritionType?: NutritionType, options?: any) { + return ApiApiFp(this.configuration).updateFoodPropertyType(id, nutritionType, options).then((request) => request(this.axios, this.basePath)); + } + /** * * @param {string} id A unique integer value identifying this import log. @@ -18318,18 +18387,6 @@ export class ApiApi extends BaseAPI { return ApiApiFp(this.configuration).updateMealType(id, mealType, options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {string} id A unique integer value identifying this nutrition type. - * @param {NutritionType} [nutritionType] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof ApiApi - */ - public updateNutritionType(id: string, nutritionType?: NutritionType, options?: any) { - return ApiApiFp(this.configuration).updateNutritionType(id, nutritionType, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {string} id A unique integer value identifying this recipe.