cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

complex food filters

Browse Source
This commit is contained in:
Chris Scoggins 2022-01-20 14:29:44 -06:00
parent 28d3d8a1e0
commit 5e36bd0c27
No known key found for this signature in database
GPG Key ID: 41617A4206CCBAC6
5 changed files with 138 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
cookbook/helper/recipe_search.py
View File

@ -38,7 +38,12 @@ class RecipeSearch():
'and_not': self._params.get('keywords_and_not', None) 'and_not': self._params.get('keywords_and_not', None)
} }
self._foods = self._params.get('foods', None) self._foods = {
'or': self._params.get('foods_or', None),
'and': self._params.get('foods_and', None),
'or_not': self._params.get('foods_or_not', None),
'and_not': self._params.get('foods_and_not', None)
}
self._books = self._params.get('books', None) self._books = self._params.get('books', None)
self._steps = self._params.get('steps', None) self._steps = self._params.get('steps', None)
self._units = self._params.get('units', None) self._units = self._params.get('units', None)
@ -48,7 +53,6 @@ class RecipeSearch():
self._sort_order = self._params.get('sort_order', None) self._sort_order = self._params.get('sort_order', None)
# TODO add save # TODO add save
self._foods_or = str2bool(self._params.get('foods_or', True))
self._books_or = str2bool(self._params.get('books_or', True)) self._books_or = str2bool(self._params.get('books_or', True))
self._internal = str2bool(self._params.get('internal', False)) self._internal = str2bool(self._params.get('internal', False))
@ -94,7 +98,7 @@ class RecipeSearch():
# self._last_viewed() # self._last_viewed()
# self._last_cooked() # self._last_cooked()
self.keyword_filters(**self._keywords) self.keyword_filters(**self._keywords)
self.food_filters(foods=self._foods, operator=self._foods_or) self.food_filters(**self._foods)
self.book_filters(books=self._books, operator=self._books_or) self.book_filters(books=self._books, operator=self._books_or)
self.rating_filter(rating=self._rating) self.rating_filter(rating=self._rating)
self.internal_filter() self.internal_filter()
@ -213,19 +217,31 @@ class RecipeSearch():
if 'not' in kw_filter: if 'not' in kw_filter:
self._queryset = self._queryset.exclude(id__in=recipes.values('id')) self._queryset = self._queryset.exclude(id__in=recipes.values('id'))
def food_filters(self, foods=None, operator=True): def food_filters(self, **kwargs):
if not foods: if all([kwargs[x] is None for x in kwargs]):
return return
if not isinstance(foods, list): for fd_filter in kwargs:
foods = [foods] if not kwargs[fd_filter]:
if operator == True: continue
# TODO creating setting to include descendants of food a setting if not isinstance(kwargs[fd_filter], list):
self._queryset = self._queryset.filter(steps__ingredients__food__in=Food.include_descendants(Food.objects.filter(pk__in=foods))) kwargs[fd_filter] = [kwargs[fd_filter]]
else:
# when performing an 'and' search returned recipes should include a parent OR any of its descedants foods = Food.objects.filter(pk__in=kwargs[fd_filter])
# AND other foods selected so filters are appended using steps__ingredients__food__id__in the list of foods and descendants if 'or' in fd_filter:
for fd in Food.objects.filter(pk__in=foods): f = Q(steps__ingredients__food__in=Food.include_descendants(foods))
self._queryset = self._queryset.filter(steps__ingredients__food__in=list(fd.get_descendants_and_self())) if 'not' in fd_filter:
self._queryset = self._queryset.exclude(f)
else:
self._queryset = self._queryset.filter(f)
elif 'and' in fd_filter:
recipes = Recipe.objects.all()
for food in foods:
if 'not' in fd_filter:
recipes = recipes.filter(steps__ingredients__food__in=food.get_descendants_and_self())
else:
self._queryset = self._queryset.filter(steps__ingredients__food__in=food.get_descendants_and_self())
if 'not' in fd_filter:
self._queryset = self._queryset.exclude(id__in=recipes.values('id'))
def unit_filters(self, units=None, operator=True): def unit_filters(self, units=None, operator=True):
if operator != True: if operator != True:

5
cookbook/views/api.py
View File

@ -639,10 +639,13 @@ class RecipeViewSet(viewsets.ModelViewSet):
QueryParam(name='keywords_or_not', description=_('Keyword IDs, repeat for multiple Exclude recipes with any of the keywords.'), qtype='int'), QueryParam(name='keywords_or_not', description=_('Keyword IDs, repeat for multiple Exclude recipes with any of the keywords.'), qtype='int'),
QueryParam(name='keywords_and_not', description=_('Keyword IDs, repeat for multiple Exclude recipes with all of the keywords.'), qtype='int'), QueryParam(name='keywords_and_not', description=_('Keyword IDs, repeat for multiple Exclude recipes with all of the keywords.'), qtype='int'),
QueryParam(name='foods', description=_('ID of food a recipe should have. For multiple repeat parameter.'), qtype='int'), QueryParam(name='foods', description=_('ID of food a recipe should have. For multiple repeat parameter.'), qtype='int'),
QueryParam(name='foods_or', description=_('Food IDs, repeat for multiple Return recipes with any of the foods'), qtype='int'),
QueryParam(name='foods_and', description=_('Food IDs, repeat for multiple Return recipes with all of the foods.'), qtype='int'),
QueryParam(name='foods_or_not', description=_('Food IDs, repeat for multiple Exclude recipes with any of the foods.'), qtype='int'),
QueryParam(name='foods_and_not', description=_('Food IDs, repeat for multiple Exclude recipes with all of the foods.'), qtype='int'),
QueryParam(name='units', description=_('ID of unit a recipe should have.'), qtype='int'), QueryParam(name='units', description=_('ID of unit a recipe should have.'), qtype='int'),
QueryParam(name='rating', description=_('Rating a recipe should have. [0 - 5]'), qtype='int'), QueryParam(name='rating', description=_('Rating a recipe should have. [0 - 5]'), qtype='int'),
QueryParam(name='books', description=_('ID of book a recipe should be in. For multiple repeat parameter.')), QueryParam(name='books', description=_('ID of book a recipe should be in. For multiple repeat parameter.')),
QueryParam(name='foods_or', description=_('If recipe should have all (AND=''false'') or any (OR=''<b>true</b>'') of the provided foods.')),
QueryParam(name='books_or', description=_('If recipe should be in all (AND=''false'') or any (OR=''<b>true</b>'') of the provided books.')), QueryParam(name='books_or', description=_('If recipe should be in all (AND=''false'') or any (OR=''<b>true</b>'') of the provided books.')),
QueryParam(name='internal', description=_('If only internal recipes should be returned. [''true''/''<b>false</b>'']')), QueryParam(name='internal', description=_('If only internal recipes should be returned. [''true''/''<b>false</b>'']')),
QueryParam(name='random', description=_('Returns the results in randomized order. [''true''/''<b>false</b>'']')), QueryParam(name='random', description=_('Returns the results in randomized order. [''true''/''<b>false</b>'']')),

95
vue/src/apps/RecipeSearchView/RecipeSearchView.vue
View File

@ -141,28 +141,28 @@
</b-popover> </b-popover>
<!-- keywords filter --> <!-- keywords filter -->
<h5 v-if="search.expert_mode && search.keywords_fields > 1">{{ $t("Keywords") }}</h5> <h6 class="mb-0" v-if="search.expert_mode && search.keywords_fields > 1">{{ $t("Keywords") }}</h6>
<div class="row" v-if="ui.show_keywords"> <div class="row" v-if="ui.show_keywords">
<div class="col-12"> <div class="col-12">
<b-input-group class="mt-2" v-for="(x, i) in keywordFields" :key="i"> <b-input-group class="mt-2" v-for="(k, a) in keywordFields" :key="a">
<template #prepend v-if="search.expert_mode"> <template #prepend v-if="search.expert_mode">
<b-input-group-text style="width: 3em" @click="search.keywords_fields = search.keywords_fields + 1"> <b-input-group-text style="width: 3em" @click="search.keywords_fields = search.keywords_fields + 1">
<i class="fas fa-plus-circle text-primary" v-if="x == search.keywords_fields && x < 4" /> <i class="fas fa-plus-circle text-primary" v-if="k == search.keywords_fields && k < 4" />
</b-input-group-text> </b-input-group-text>
<b-input-group-text <b-input-group-text
style="width: 3em" style="width: 3em"
@click=" @click="
search.keywords_fields = search.keywords_fields - 1 search.keywords_fields = search.keywords_fields - 1
search.search_keywords[i].items = [] search.search_keywords[a].items = []
refreshData(false) refreshData(false)
" "
> >
<i class="fas fa-minus-circle text-primary" v-if="x == search.keywords_fields && x > 1" /> <i class="fas fa-minus-circle text-primary" v-if="k == search.keywords_fields && k > 1" />
</b-input-group-text> </b-input-group-text>
</template> </template>
<treeselect <treeselect
v-if="ui.tree_select" v-if="ui.tree_select"
v-model="search.search_keywords[i].items" v-model="search.search_keywords[a].items"
:options="facets.Keywords" :options="facets.Keywords"
:load-options="loadKeywordChildren" :load-options="loadKeywordChildren"
:multiple="true" :multiple="true"
@ -177,31 +177,31 @@
<generic-multiselect <generic-multiselect
v-if="!ui.tree_select" v-if="!ui.tree_select"
@change="genericSelectChanged" @change="genericSelectChanged"
:parent_variable="`search_keywords::${i}`" :parent_variable="`search_keywords::${a}`"
:initial_selection="search.search_keywords[i].items" :initial_selection="search.search_keywords[a].items"
:model="Models.KEYWORD" :model="Models.KEYWORD"
style="flex-grow: 1; flex-shrink: 1; flex-basis: 0" style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"
:placeholder="$t('Keywords')" :placeholder="$t('Keywords')"
:limit="50" :limit="50"
></generic-multiselect> />
<b-input-group-append> <b-input-group-append>
<b-input-group-text> <b-input-group-text>
<b-form-checkbox <b-form-checkbox
v-model="search.search_keywords[i].operator" v-model="search.search_keywords[a].operator"
name="check-button" name="check-button"
@change="refreshData(false)" @change="refreshData(false)"
class="shadow-none" class="shadow-none"
switch switch
style="width: 4em" style="width: 4em"
> >
<span class="text-uppercase" v-if="search.search_keywords[i].operator">{{ $t("or") }}</span> <span class="text-uppercase" v-if="search.search_keywords[a].operator">{{ $t("or") }}</span>
<span class="text-uppercase" v-else>{{ $t("and") }}</span> <span class="text-uppercase" v-else>{{ $t("and") }}</span>
</b-form-checkbox> </b-form-checkbox>
</b-input-group-text> </b-input-group-text>
</b-input-group-append> </b-input-group-append>
<b-input-group-append v-if="search.expert_mode"> <b-input-group-append v-if="search.expert_mode">
<b-input-group-text> <b-input-group-text>
<b-form-checkbox v-model="search.search_keywords[i].not" name="check-button" @change="refreshData(false)" class="shadow-none"> <b-form-checkbox v-model="search.search_keywords[a].not" name="check-button" @change="refreshData(false)" class="shadow-none">
<span class="text-uppercase">{{ $t("not") }}</span> <span class="text-uppercase">{{ $t("not") }}</span>
</b-form-checkbox> </b-form-checkbox>
</b-input-group-text> </b-input-group-text>
@ -211,12 +211,28 @@
</div> </div>
<!-- foods filter --> <!-- foods filter -->
<h6 class="mt-2 mb-0" v-if="search.expert_mode && search.foods_fields > 1">{{ $t("Foods") }}</h6>
<div class="row" v-if="ui.show_foods"> <div class="row" v-if="ui.show_foods">
<div class="col-12"> <div class="col-12">
<b-input-group class="mt-2"> <b-input-group class="mt-2" v-for="(x, i) in foodFields" :key="i">
<template #prepend v-if="search.expert_mode">
<b-input-group-text style="width: 3em" @click="search.foods_fields = search.foods_fields + 1">
<i class="fas fa-plus-circle text-primary" v-if="x == search.foods_fields && x < 4" />
</b-input-group-text>
<b-input-group-text
style="width: 3em"
@click="
search.foods_fields = search.foods_fields - 1
search.search_foods[i].items = []
refreshData(false)
"
>
<i class="fas fa-minus-circle text-primary" v-if="x == search.foods_fields && x > 1" />
</b-input-group-text>
</template>
<treeselect <treeselect
v-if="ui.tree_select" v-if="ui.tree_select"
v-model="search.search_foods" v-model="search.search_foods[i].items"
:options="facets.Foods" :options="facets.Foods"
:load-options="loadFoodChildren" :load-options="loadFoodChildren"
:multiple="true" :multiple="true"
@ -231,21 +247,28 @@
<generic-multiselect <generic-multiselect
v-if="!ui.tree_select" v-if="!ui.tree_select"
@change="genericSelectChanged" @change="genericSelectChanged"
parent_variable="search_foods" :parent_variable="`search_foods::${i}`"
:initial_selection="search.search_foods" :initial_selection="search.search_foods[i].items"
:model="Models.FOOD" :model="Models.FOOD"
style="flex-grow: 1; flex-shrink: 1; flex-basis: 0" style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"
:placeholder="$t('Foods')" :placeholder="$t('Foods')"
:limit="50" :limit="50"
></generic-multiselect> />
<b-input-group-append> <b-input-group-append>
<b-input-group-text> <b-input-group-text>
<b-form-checkbox v-model="search.search_foods_or" name="check-button" @change="refreshData(false)" class="shadow-none" switch style="width: 4em"> <b-form-checkbox v-model="search.search_foods[i].operator" name="check-button" @change="refreshData(false)" class="shadow-none" switch style="width: 4em">
<span class="text-uppercase" v-if="search.search_foods_or">{{ $t("or") }}</span> <span class="text-uppercase" v-if="search.search_foods[i].operator">{{ $t("or") }}</span>
<span class="text-uppercase" v-else>{{ $t("and") }}</span> <span class="text-uppercase" v-else>{{ $t("and") }}</span>
</b-form-checkbox> </b-form-checkbox>
</b-input-group-text> </b-input-group-text>
</b-input-group-append> </b-input-group-append>
<b-input-group-append v-if="search.expert_mode">
<b-input-group-text>
<b-form-checkbox v-model="search.search_foods[i].not" name="check-button" @change="refreshData(false)" class="shadow-none">
<span class="text-uppercase">{{ $t("not") }}</span>
</b-form-checkbox>
</b-input-group-text>
</b-input-group-append>
</b-input-group> </b-input-group>
</div> </div>
</div> </div>
@ -409,22 +432,25 @@ export default {
{ items: [], operator: true, not: false }, { items: [], operator: true, not: false },
{ items: [], operator: true, not: false }, { items: [], operator: true, not: false },
], ],
search_foods: [], search_foods: [
{ items: [], operator: true, not: false },
{ items: [], operator: true, not: false },
{ items: [], operator: true, not: false },
{ items: [], operator: true, not: false },
],
search_books: [], search_books: [],
search_units: [], search_units: [],
search_rating: undefined, search_rating: undefined,
search_rating_gte: true, search_rating_gte: true,
search_keywords_or: true,
search_foods_or: true,
search_books_or: true, search_books_or: true,
search_units_or: true, search_units_or: true,
pagination_page: 1, pagination_page: 1,
expert_mode: false, expert_mode: false,
keywords_fields: 1, keywords_fields: 1,
food_fields: 1, foods_fields: 1,
book_fields: 1, books_fields: 1,
rating_fields: 1, rating_fields: 1,
unit_fields: 1, units_fields: 1,
}, },
ui: { ui: {
show_meal_plan: true, show_meal_plan: true,
@ -497,16 +523,16 @@ export default {
return !this.expertMode ? 1 : this.search.keywords_fields return !this.expertMode ? 1 : this.search.keywords_fields
}, },
foodFields: function () { foodFields: function () {
return !this.expertMode ? 1 : this.search.food_fields return !this.expertMode ? 1 : this.search.foods_fields
}, },
bookFields: function () { bookFields: function () {
return !this.expertMode ? 1 : this.search.book_fields return !this.expertMode ? 1 : this.search.books_fields
}, },
ratingFields: function () { ratingFields: function () {
return !this.expertMode ? 1 : this.search.rating_fields return !this.expertMode ? 1 : this.search.rating_fields
}, },
unitFields: function () { unitFields: function () {
return !this.expertMode ? 1 : this.search.unit_fields return !this.expertMode ? 1 : this.search.units_fields
}, },
}, },
mounted() { mounted() {
@ -544,7 +570,7 @@ export default {
} }
this.facets.Foods = [] this.facets.Foods = []
for (let x of this.search.search_foods) { for (let x of this.search.search_foods.map((x) => x.items).flat()) {
this.facets.Foods.push({ id: x, name: "loading..." }) this.facets.Foods.push({ id: x, name: "loading..." })
} }
@ -663,7 +689,9 @@ export default {
this.search.search_keywords = this.search.search_keywords.map((x) => { this.search.search_keywords = this.search.search_keywords.map((x) => {
return { ...x, items: [] } return { ...x, items: [] }
}) })
this.search.search_foods = [] this.search.search_foods = this.search.search_foods.map((x) => {
return { ...x, items: [] }
})
this.search.search_books = [] this.search.search_books = []
this.search.search_units = [] this.search.search_units = []
this.search.search_rating = undefined this.search.search_rating = undefined
@ -735,15 +763,12 @@ export default {
this.addFields("keywords") this.addFields("keywords")
let params = { let params = {
...this.addFields("keywords"), ...this.addFields("keywords"),
...this.addFields("foods"),
query: this.search.search_input, query: this.search.search_input,
foods: this.search.search_foods.map(function (A) {
return A?.["id"] ?? A
}),
rating: rating, rating: rating,
books: this.search.search_books.map(function (A) { books: this.search.search_books.map(function (A) {
return A["id"] return A["id"]
}), }),
foodsOr: this.search.search_foods_or,
booksOr: this.search.search_books_or, booksOr: this.search.search_books_or,
internal: this.search.search_internal, internal: this.search.search_internal,
random: this.random_search, random: this.random_search,
@ -760,7 +785,7 @@ export default {
searchFiltered: function (ignore_string = false) { searchFiltered: function (ignore_string = false) {
let filtered = let filtered =
this.search?.search_keywords[0].items?.length === 0 && this.search?.search_keywords[0].items?.length === 0 &&
this.search?.search_foods?.length === 0 && this.search?.search_foods[0].items?.length === 0 &&
this.search?.search_books?.length === 0 && this.search?.search_books?.length === 0 &&
// this.settings?.pagination_page === 1 && // this.settings?.pagination_page === 1 &&
!this.random_search && !this.random_search &&

5
vue/src/utils/models.js
View File

@ -441,10 +441,13 @@ export class Models {
"keywords_or_not", "keywords_or_not",
"keywords_and_not", "keywords_and_not",
"foods", "foods",
"foods_or",
"foods_and",
"foods_or_not",
"foods_and_not",
"units", "units",
"rating", "rating",
"books", "books",
"foodsOr",
"booksOr", "booksOr",
"internal", "internal",
"random", "random",

54
vue/src/utils/openapi/api.ts
View File

@ -5288,10 +5288,13 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
* @param {number} [keywordsOrNot] Keyword IDs, repeat for multiple Exclude recipes with any of the keywords. * @param {number} [keywordsOrNot] Keyword IDs, repeat for multiple Exclude recipes with any of the keywords.
* @param {number} [keywordsAndNot] Keyword IDs, repeat for multiple Exclude recipes with all of the keywords. * @param {number} [keywordsAndNot] Keyword IDs, repeat for multiple Exclude recipes with all of the keywords.
* @param {number} [foods] ID of food a recipe should have. For multiple repeat parameter. * @param {number} [foods] ID of food a recipe should have. For multiple repeat parameter.
* @param {number} [foodsOr] Food IDs, repeat for multiple Return recipes with any of the foods
* @param {number} [foodsAnd] Food IDs, repeat for multiple Return recipes with all of the foods.
* @param {number} [foodsOrNot] Food IDs, repeat for multiple Exclude recipes with any of the foods.
* @param {number} [foodsAndNot] Food IDs, repeat for multiple Exclude recipes with all of the foods.
* @param {number} [units] ID of unit a recipe should have. * @param {number} [units] ID of unit a recipe should have.
* @param {number} [rating] Rating a recipe should have. [0 - 5] * @param {number} [rating] Rating a recipe should have. [0 - 5]
* @param {string} [books] ID of book a recipe should be in. For multiple repeat parameter. * @param {string} [books] ID of book a recipe should be in. For multiple repeat parameter.
* @param {string} [foodsOr] If recipe should have all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided foods.
* @param {string} [booksOr] If recipe should be in all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided books. * @param {string} [booksOr] If recipe should be in all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided books.
* @param {string} [internal] If only internal recipes should be returned. [true/&lt;b&gt;false&lt;/b&gt;] * @param {string} [internal] If only internal recipes should be returned. [true/&lt;b&gt;false&lt;/b&gt;]
* @param {string} [random] Returns the results in randomized order. [true/&lt;b&gt;false&lt;/b&gt;] * @param {string} [random] Returns the results in randomized order. [true/&lt;b&gt;false&lt;/b&gt;]
@ -5301,7 +5304,7 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
listRecipes: async (query?: string, keywords?: number, keywordsOr?: number, keywordsAnd?: number, keywordsOrNot?: number, keywordsAndNot?: number, foods?: number, units?: number, rating?: number, books?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options: any = {}): Promise<RequestArgs> => { listRecipes: async (query?: string, keywords?: number, keywordsOr?: number, keywordsAnd?: number, keywordsOrNot?: number, keywordsAndNot?: number, foods?: number, foodsOr?: number, foodsAnd?: number, foodsOrNot?: number, foodsAndNot?: number, units?: number, rating?: number, books?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options: any = {}): Promise<RequestArgs> => {
const localVarPath = `/api/recipe/`; const localVarPath = `/api/recipe/`;
// use dummy base URL string because the URL constructor only accepts absolute URLs. // use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@ -5342,6 +5345,22 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
localVarQueryParameter['foods'] = foods; localVarQueryParameter['foods'] = foods;
} }
if (foodsOr !== undefined) {
localVarQueryParameter['foods_or'] = foodsOr;
}
if (foodsAnd !== undefined) {
localVarQueryParameter['foods_and'] = foodsAnd;
}
if (foodsOrNot !== undefined) {
localVarQueryParameter['foods_or_not'] = foodsOrNot;
}
if (foodsAndNot !== undefined) {
localVarQueryParameter['foods_and_not'] = foodsAndNot;
}
if (units !== undefined) { if (units !== undefined) {
localVarQueryParameter['units'] = units; localVarQueryParameter['units'] = units;
} }
@ -5354,10 +5373,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
localVarQueryParameter['books'] = books; localVarQueryParameter['books'] = books;
} }
if (foodsOr !== undefined) {
localVarQueryParameter['foods_or'] = foodsOr;
}
if (booksOr !== undefined) { if (booksOr !== undefined) {
localVarQueryParameter['books_or'] = booksOr; localVarQueryParameter['books_or'] = booksOr;
} }
@ -9693,10 +9708,13 @@ export const ApiApiFp = function(configuration?: Configuration) {
* @param {number} [keywordsOrNot] Keyword IDs, repeat for multiple Exclude recipes with any of the keywords. * @param {number} [keywordsOrNot] Keyword IDs, repeat for multiple Exclude recipes with any of the keywords.
* @param {number} [keywordsAndNot] Keyword IDs, repeat for multiple Exclude recipes with all of the keywords. * @param {number} [keywordsAndNot] Keyword IDs, repeat for multiple Exclude recipes with all of the keywords.
* @param {number} [foods] ID of food a recipe should have. For multiple repeat parameter. * @param {number} [foods] ID of food a recipe should have. For multiple repeat parameter.
* @param {number} [foodsOr] Food IDs, repeat for multiple Return recipes with any of the foods
* @param {number} [foodsAnd] Food IDs, repeat for multiple Return recipes with all of the foods.
* @param {number} [foodsOrNot] Food IDs, repeat for multiple Exclude recipes with any of the foods.
* @param {number} [foodsAndNot] Food IDs, repeat for multiple Exclude recipes with all of the foods.
* @param {number} [units] ID of unit a recipe should have. * @param {number} [units] ID of unit a recipe should have.
* @param {number} [rating] Rating a recipe should have. [0 - 5] * @param {number} [rating] Rating a recipe should have. [0 - 5]
* @param {string} [books] ID of book a recipe should be in. For multiple repeat parameter. * @param {string} [books] ID of book a recipe should be in. For multiple repeat parameter.
* @param {string} [foodsOr] If recipe should have all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided foods.
* @param {string} [booksOr] If recipe should be in all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided books. * @param {string} [booksOr] If recipe should be in all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided books.
* @param {string} [internal] If only internal recipes should be returned. [true/&lt;b&gt;false&lt;/b&gt;] * @param {string} [internal] If only internal recipes should be returned. [true/&lt;b&gt;false&lt;/b&gt;]
* @param {string} [random] Returns the results in randomized order. [true/&lt;b&gt;false&lt;/b&gt;] * @param {string} [random] Returns the results in randomized order. [true/&lt;b&gt;false&lt;/b&gt;]
@ -9706,8 +9724,8 @@ export const ApiApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
async listRecipes(query?: string, keywords?: number, keywordsOr?: number, keywordsAnd?: number, keywordsOrNot?: number, keywordsAndNot?: number, foods?: number, units?: number, rating?: number, books?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse2004>> { async listRecipes(query?: string, keywords?: number, keywordsOr?: number, keywordsAnd?: number, keywordsOrNot?: number, keywordsAndNot?: number, foods?: number, foodsOr?: number, foodsAnd?: number, foodsOrNot?: number, foodsAndNot?: number, units?: number, rating?: number, books?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse2004>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.listRecipes(query, keywords, keywordsOr, keywordsAnd, keywordsOrNot, keywordsAndNot, foods, units, rating, books, foodsOr, booksOr, internal, random, _new, page, pageSize, options); const localVarAxiosArgs = await localVarAxiosParamCreator.listRecipes(query, keywords, keywordsOr, keywordsAnd, keywordsOrNot, keywordsAndNot, foods, foodsOr, foodsAnd, foodsOrNot, foodsAndNot, units, rating, books, booksOr, internal, random, _new, page, pageSize, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
}, },
/** /**
@ -11381,10 +11399,13 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
* @param {number} [keywordsOrNot] Keyword IDs, repeat for multiple Exclude recipes with any of the keywords. * @param {number} [keywordsOrNot] Keyword IDs, repeat for multiple Exclude recipes with any of the keywords.
* @param {number} [keywordsAndNot] Keyword IDs, repeat for multiple Exclude recipes with all of the keywords. * @param {number} [keywordsAndNot] Keyword IDs, repeat for multiple Exclude recipes with all of the keywords.
* @param {number} [foods] ID of food a recipe should have. For multiple repeat parameter. * @param {number} [foods] ID of food a recipe should have. For multiple repeat parameter.
* @param {number} [foodsOr] Food IDs, repeat for multiple Return recipes with any of the foods
* @param {number} [foodsAnd] Food IDs, repeat for multiple Return recipes with all of the foods.
* @param {number} [foodsOrNot] Food IDs, repeat for multiple Exclude recipes with any of the foods.
* @param {number} [foodsAndNot] Food IDs, repeat for multiple Exclude recipes with all of the foods.
* @param {number} [units] ID of unit a recipe should have. * @param {number} [units] ID of unit a recipe should have.
* @param {number} [rating] Rating a recipe should have. [0 - 5] * @param {number} [rating] Rating a recipe should have. [0 - 5]
* @param {string} [books] ID of book a recipe should be in. For multiple repeat parameter. * @param {string} [books] ID of book a recipe should be in. For multiple repeat parameter.
* @param {string} [foodsOr] If recipe should have all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided foods.
* @param {string} [booksOr] If recipe should be in all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided books. * @param {string} [booksOr] If recipe should be in all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided books.
* @param {string} [internal] If only internal recipes should be returned. [true/&lt;b&gt;false&lt;/b&gt;] * @param {string} [internal] If only internal recipes should be returned. [true/&lt;b&gt;false&lt;/b&gt;]
* @param {string} [random] Returns the results in randomized order. [true/&lt;b&gt;false&lt;/b&gt;] * @param {string} [random] Returns the results in randomized order. [true/&lt;b&gt;false&lt;/b&gt;]
@ -11394,8 +11415,8 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
listRecipes(query?: string, keywords?: number, keywordsOr?: number, keywordsAnd?: number, keywordsOrNot?: number, keywordsAndNot?: number, foods?: number, units?: number, rating?: number, books?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options?: any): AxiosPromise<InlineResponse2004> { listRecipes(query?: string, keywords?: number, keywordsOr?: number, keywordsAnd?: number, keywordsOrNot?: number, keywordsAndNot?: number, foods?: number, foodsOr?: number, foodsAnd?: number, foodsOrNot?: number, foodsAndNot?: number, units?: number, rating?: number, books?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options?: any): AxiosPromise<InlineResponse2004> {
return localVarFp.listRecipes(query, keywords, keywordsOr, keywordsAnd, keywordsOrNot, keywordsAndNot, foods, units, rating, books, foodsOr, booksOr, internal, random, _new, page, pageSize, options).then((request) => request(axios, basePath)); return localVarFp.listRecipes(query, keywords, keywordsOr, keywordsAnd, keywordsOrNot, keywordsAndNot, foods, foodsOr, foodsAnd, foodsOrNot, foodsAndNot, units, rating, books, booksOr, internal, random, _new, page, pageSize, options).then((request) => request(axios, basePath));
}, },
/** /**
* *
@ -13093,10 +13114,13 @@ export class ApiApi extends BaseAPI {
* @param {number} [keywordsOrNot] Keyword IDs, repeat for multiple Exclude recipes with any of the keywords. * @param {number} [keywordsOrNot] Keyword IDs, repeat for multiple Exclude recipes with any of the keywords.
* @param {number} [keywordsAndNot] Keyword IDs, repeat for multiple Exclude recipes with all of the keywords. * @param {number} [keywordsAndNot] Keyword IDs, repeat for multiple Exclude recipes with all of the keywords.
* @param {number} [foods] ID of food a recipe should have. For multiple repeat parameter. * @param {number} [foods] ID of food a recipe should have. For multiple repeat parameter.
* @param {number} [foodsOr] Food IDs, repeat for multiple Return recipes with any of the foods
* @param {number} [foodsAnd] Food IDs, repeat for multiple Return recipes with all of the foods.
* @param {number} [foodsOrNot] Food IDs, repeat for multiple Exclude recipes with any of the foods.
* @param {number} [foodsAndNot] Food IDs, repeat for multiple Exclude recipes with all of the foods.
* @param {number} [units] ID of unit a recipe should have. * @param {number} [units] ID of unit a recipe should have.
* @param {number} [rating] Rating a recipe should have. [0 - 5] * @param {number} [rating] Rating a recipe should have. [0 - 5]
* @param {string} [books] ID of book a recipe should be in. For multiple repeat parameter. * @param {string} [books] ID of book a recipe should be in. For multiple repeat parameter.
* @param {string} [foodsOr] If recipe should have all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided foods.
* @param {string} [booksOr] If recipe should be in all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided books. * @param {string} [booksOr] If recipe should be in all (AND&#x3D;false) or any (OR&#x3D;&lt;b&gt;true&lt;/b&gt;) of the provided books.
* @param {string} [internal] If only internal recipes should be returned. [true/&lt;b&gt;false&lt;/b&gt;] * @param {string} [internal] If only internal recipes should be returned. [true/&lt;b&gt;false&lt;/b&gt;]
* @param {string} [random] Returns the results in randomized order. [true/&lt;b&gt;false&lt;/b&gt;] * @param {string} [random] Returns the results in randomized order. [true/&lt;b&gt;false&lt;/b&gt;]
@ -13107,8 +13131,8 @@ export class ApiApi extends BaseAPI {
* @throws {RequiredError} * @throws {RequiredError}
* @memberof ApiApi * @memberof ApiApi
*/ */
public listRecipes(query?: string, keywords?: number, keywordsOr?: number, keywordsAnd?: number, keywordsOrNot?: number, keywordsAndNot?: number, foods?: number, units?: number, rating?: number, books?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options?: any) { public listRecipes(query?: string, keywords?: number, keywordsOr?: number, keywordsAnd?: number, keywordsOrNot?: number, keywordsAndNot?: number, foods?: number, foodsOr?: number, foodsAnd?: number, foodsOrNot?: number, foodsAndNot?: number, units?: number, rating?: number, books?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options?: any) {
return ApiApiFp(this.configuration).listRecipes(query, keywords, keywordsOr, keywordsAnd, keywordsOrNot, keywordsAndNot, foods, units, rating, books, foodsOr, booksOr, internal, random, _new, page, pageSize, options).then((request) => request(this.axios, this.basePath)); return ApiApiFp(this.configuration).listRecipes(query, keywords, keywordsOr, keywordsAnd, keywordsOrNot, keywordsAndNot, foods, foodsOr, foodsAnd, foodsOrNot, foodsAndNot, units, rating, books, booksOr, internal, random, _new, page, pageSize, options).then((request) => request(this.axios, this.basePath));
} }
/** /**