Merge branch 'TandoorRecipes:feature/vue3' into feature/vue3

.idea/watcherTasks.xml

@@ -5,7 +5,7 @@
       <option name="arguments" value="-m flake8 $FilePath$ --config $ContentRoot$\.flake8" />
       <option name="checkSyntaxErrors" value="true" />
       <option name="description" />
-      <option name="exitCodeBehavior" value="ALWAYS" />
+      <option name="exitCodeBehavior" value="NEVER" />
       <option name="fileExtension" value="py" />
       <option name="immediateSync" value="false" />
       <option name="name" value="Flake8 Watcher" />
@@ -27,5 +27,65 @@
       <option name="workingDir" value="" />
       <envs />
     </TaskOptions>
+    <TaskOptions isEnabled="true">
+      <option name="arguments" value="-m isort $FilePath$" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="ERROR" />
+      <option name="fileExtension" value="py" />
+      <option name="immediateSync" value="false" />
+      <option name="name" value="isort Watcher" />
+      <option name="output" value="$FilePath$" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="$PyInterpreterDirectory$/python" />
+      <option name="runOnExternalChanges" value="false" />
+      <option name="scopeName" value="Project Files" />
+      <option name="trackOnlyRoot" value="false" />
+      <option name="workingDir" value="" />
+      <envs />
+    </TaskOptions>
+    <TaskOptions isEnabled="true">
+      <option name="arguments" value="-m yapf -i $FilePath$" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="NEVER" />
+      <option name="fileExtension" value="py" />
+      <option name="immediateSync" value="false" />
+      <option name="name" value="YAPF" />
+      <option name="output" value="$FilePath$" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="$PyInterpreterDirectory$/python" />
+      <option name="runOnExternalChanges" value="false" />
+      <option name="scopeName" value="Project Files" />
+      <option name="trackOnlyRoot" value="false" />
+      <option name="workingDir" value="" />
+      <envs />
+    </TaskOptions>
+    <TaskOptions isEnabled="true">
+      <option name="arguments" value="--cwd $ProjectFileDir$\vue prettier -w --config $ProjectFileDir$\.prettierrc $FilePath$" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="ERROR" />
+      <option name="fileExtension" value="*" />
+      <option name="immediateSync" value="true" />
+      <option name="name" value="Prettier" />
+      <option name="output" value="" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="yarn" />
+      <option name="runOnExternalChanges" value="true" />
+      <option name="scopeName" value="Prettier" />
+      <option name="trackOnlyRoot" value="false" />
+      <option name="workingDir" value="" />
+      <envs />
+    </TaskOptions>
   </component>
 </project>

cookbook/helper/drf_spectacular_hooks.py

@@ -1,41 +1,17 @@
 # custom processing for schema
 # reason: DRF writable nested needs ID's to decide if a nested object should be created or updated
 # the API schema/client make ID's read only by default and strips them entirely in request objects (with COMPONENT_SPLIT_REQUEST enabled)
-# change request objects (schema ends with Request) and response objects (just model name) to the following:
-#   response objects: id field is required but read only
-#   request objects: id field is optional but writable/included
-
-# WARNING: COMPONENT_SPLIT_REQUEST must be enabled, if not schemas might be wrong
-
+# change the schema to make IDs optional but writable so they are included in the request
 
 def custom_postprocessing_hook(result, generator, request, public):
     for c in result['components']['schemas'].keys():
         # handle schemas used by the client to do requests on the server
-        if c.strip().endswith('Request'):
-            # check if request schema has a corresponding response schema to avoid changing request schemas for models that end with the word Request
-            response_schema = None
-            if c.strip().replace('Request', '') in result['components']['schemas'].keys():
-                response_schema = c.strip().replace('Request', '')
-            elif c.strip().startswith('Patched') and c.strip().replace('Request', '').replace('Patched', '', 1) in result['components']['schemas'].keys():
-                response_schema = c.strip().replace('Request', '').replace('Patched', '', 1)
-
-            # if response schema exist update request schema to include writable, optional id
-            if response_schema and 'id' in result['components']['schemas'][response_schema]['properties']:
-                if 'id' not in result['components']['schemas'][c]['properties']:
-                    result['components']['schemas'][c]['properties']['id'] = {'readOnly': False, 'type': 'integer'}
-                # this is probably never the case but make sure ID is not required anyway
-                if 'required' in result['components']['schemas'][c] and 'id' in result['components']['schemas'][c]['required']:
-                    result['components']['schemas'][c]['required'].remove('id')
-        # handle all schemas returned by the server to the client
-        else:
-            if 'properties' in result['components']['schemas'][c] and 'id' in result['components']['schemas'][c]['properties']:
-                # make ID field not read only so it's not stripped from the request on the client
-                result['components']['schemas'][c]['properties']['id']['readOnly'] = True
-                # make ID field required because if an object has an id it should also always be returned
-                if 'required' not in result['components']['schemas'][c]:
-                    result['components']['schemas'][c]['required'] = ['id']
-                else:
-                    result['components']['schemas'][c]['required'].append('id')
+        if 'properties' in result['components']['schemas'][c] and 'id' in result['components']['schemas'][c]['properties']:
+            # make ID field not read only so it's not stripped from the request on the client
+            result['components']['schemas'][c]['properties']['id']['readOnly'] = False
+            # make ID field not required
+            if 'required' in result['components']['schemas'][c] and 'id' in result['components']['schemas'][c]['required']:
+                result['components']['schemas'][c]['required'].remove('id')
 
     return result
 

cookbook/integration/nextcloud_cookbook.py

@@ -60,20 +60,20 @@ class NextcloudCookbook(Integration):
                 step = Step.objects.create(
                     instruction=s, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
                 )
-            if not ingredients_added:
-                if len(recipe_json['description'].strip()) > 500:
-                    step.instruction = recipe_json['description'].strip() + '\n\n' + step.instruction
 
-                ingredients_added = True
-
-                ingredient_parser = IngredientParser(self.request, True)
+            ingredient_parser = IngredientParser(self.request, True)
+            if ingredients_added == False:
                 for ingredient in recipe_json['recipeIngredient']:
-                    amount, unit, food, note = ingredient_parser.parse(ingredient)
-                    f = ingredient_parser.get_food(food)
-                    u = ingredient_parser.get_unit(unit)
-                    step.ingredients.add(Ingredient.objects.create(
-                        food=f, unit=u, amount=amount, note=note, original_text=ingredient, space=self.request.space,
-                    ))
+                    ingredients_added = True
+                    if ingredient.startswith('##'):
+                        subheader = ingredient.replace('##', '', 1)
+                        step.ingredients.add(Ingredient.objects.create(note=subheader, is_header=True, no_amount=True, space=self.request.space))
+                    else:
+                        amount, unit, food, note = ingredient_parser.parse(ingredient)
+                        f = ingredient_parser.get_food(food)
+                        u = ingredient_parser.get_unit(unit)
+                        step.ingredients.add(Ingredient.objects.create(
+                            food=f, unit=u, amount=amount, note=note, original_text=ingredient, space=self.request.space,))
             recipe.steps.add(step)
 
         if 'nutrition' in recipe_json:

cookbook/integration/plantoeat.py

@@ -4,6 +4,7 @@ import requests
 import validators
 
 from cookbook.helper.ingredient_parser import IngredientParser
+from cookbook.helper.recipe_url_import import parse_servings, parse_servings_text, parse_time
 from cookbook.integration.integration import Integration
 from cookbook.models import Ingredient, Keyword, Recipe, Step
 
@@ -18,32 +19,38 @@ class Plantoeat(Integration):
         tags = None
         ingredients = []
         directions = []
-        description = ''
+        fields = {}
         for line in file.replace('\r', '').split('\n'):
             if line.strip() != '':
                 if 'Title:' in line:
-                    title = line.replace('Title:', '').replace('"', '').strip()
+                    fields['name'] = line.replace('Title:', '').replace('"', '').strip()
                 if 'Description:' in line:
-                    description = line.replace('Description:', '').strip()
-                if 'Source:' in line or 'Serves:' in line or 'Prep Time:' in line or 'Cook Time:' in line:
-                    directions.append(line.strip() + '\n')
+                    fields['description'] = line.replace('Description:', '').strip()
+                if 'Serves:' in line:
+                    fields['servings'] = parse_servings(line.replace('Serves:', '').strip())
+                if 'Source:' in line:
+                    fields['source_url'] = line.replace('Source:', '').strip()
                 if 'Photo Url:' in line:
                     image_url = line.replace('Photo Url:', '').strip()
+                if 'Prep Time:' in line:
+                    fields['working_time'] = parse_time(line.replace('Prep Time:', '').strip())
+                if 'Cook Time:' in line:
+                    fields['waiting_time'] = parse_time(line.replace('Cook Time:', '').strip())
                 if 'Tags:' in line:
                     tags = line.replace('Tags:', '').strip()
-                if ingredient_mode:
-                    if len(line) > 2 and 'Instructions:' not in line:
-                        ingredients.append(line.strip())
-                if direction_mode:
-                    if len(line) > 2:
-                        directions.append(line.strip() + '\n')
                 if 'Ingredients:' in line:
                     ingredient_mode = True
                 if 'Directions:' in line:
                     ingredient_mode = False
                     direction_mode = True
+                if ingredient_mode:
+                    if len(line) > 2 and 'Ingredients:' not in line:
+                        ingredients.append(line.strip())
+                if direction_mode:
+                    if len(line) > 2:
+                        directions.append(line.strip() + '\n')                
 
-        recipe = Recipe.objects.create(name=title, description=description, created_by=self.request.user, internal=True, space=self.request.space)
+        recipe = Recipe.objects.create(**fields, created_by=self.request.user, internal=True, space=self.request.space)
 
         step = Step.objects.create(
             instruction='\n'.join(directions) + '\n\n', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,

cookbook/templates/base.html

@@ -4,7 +4,7 @@
 {% load custom_tags %}
 
 {% theme_values request as theme_values %}
-
+<!DOCTYPE html>
 <html>
 <head>
     <title>{% block title %}

recipes/settings.py

@@ -342,7 +342,7 @@ SPECTACULAR_SETTINGS = {
     'TITLE': 'Tandoor',
     'DESCRIPTION': 'Tandoor API Docs',
     'SERVE_INCLUDE_SCHEMA': False,
-    'COMPONENT_SPLIT_REQUEST': True,
+    'COMPONENT_SPLIT_REQUEST': False,
     'ENUM_ADD_EXPLICIT_BLANK_NULL_CHOICE': False,
     "AUTHENTICATION_WHITELIST": [],
     "APPEND_COMPONENTS": {

vue3/src/openapi/.openapi-generator/FILES

@@ -4,53 +4,44 @@ apis/ApiTokenAuthApi.ts
 apis/index.ts
 index.ts
 models/AccessToken.ts
-models/AccessTokenRequest.ts
 models/AuthToken.ts
-models/AuthTokenRequest.ts
 models/AutoMealPlan.ts
-models/AutoMealPlanRequest.ts
 models/Automation.ts
-models/AutomationRequest.ts
+models/AutomationTypeEnum.ts
+models/BaseUnitEnum.ts
 models/BookmarkletImport.ts
 models/BookmarkletImportList.ts
-models/BookmarkletImportRequest.ts
 models/ConnectorConfigConfig.ts
-models/ConnectorConfigConfigRequest.ts
 models/CookLog.ts
-models/CookLogRequest.ts
 models/CustomFilter.ts
-models/CustomFilterRequest.ts
 models/DefaultPageEnum.ts
 models/DeleteEnum.ts
 models/ExportLog.ts
-models/ExportLogRequest.ts
 models/Food.ts
 models/FoodInheritField.ts
-models/FoodInheritFieldRequest.ts
-models/FoodRequest.ts
 models/FoodShoppingUpdate.ts
-models/FoodShoppingUpdateRequest.ts
 models/FoodSimple.ts
-models/FoodSimpleRequest.ts
 models/Group.ts
-models/GroupRequest.ts
 models/ImportLog.ts
-models/ImportLogRequest.ts
 models/Ingredient.ts
-models/IngredientRequest.ts
-models/IngredientStringRequest.ts
+models/IngredientString.ts
 models/InviteLink.ts
-models/InviteLinkRequest.ts
 models/Keyword.ts
 models/KeywordLabel.ts
-models/KeywordRequest.ts
 models/MealPlan.ts
-models/MealPlanRequest.ts
 models/MealType.ts
-models/MealTypeRequest.ts
 models/MethodEnum.ts
 models/NutritionInformation.ts
-models/NutritionInformationRequest.ts
+models/OpenDataCategory.ts
+models/OpenDataConversion.ts
+models/OpenDataFood.ts
+models/OpenDataFoodProperty.ts
+models/OpenDataProperty.ts
+models/OpenDataStore.ts
+models/OpenDataStoreCategory.ts
+models/OpenDataUnit.ts
+models/OpenDataUnitTypeEnum.ts
+models/OpenDataVersion.ts
 models/PaginatedAutomationList.ts
 models/PaginatedBookmarkletImportListList.ts
 models/PaginatedCookLogList.ts
@@ -82,95 +73,79 @@ models/PaginatedUserFileList.ts
 models/PaginatedUserSpaceList.ts
 models/PaginatedViewLogList.ts
 models/ParsedIngredient.ts
-models/PatchedAccessTokenRequest.ts
-models/PatchedAutomationRequest.ts
-models/PatchedBookmarkletImportRequest.ts
-models/PatchedConnectorConfigConfigRequest.ts
-models/PatchedCookLogRequest.ts
-models/PatchedCustomFilterRequest.ts
-models/PatchedExportLogRequest.ts
-models/PatchedFoodRequest.ts
-models/PatchedImportLogRequest.ts
-models/PatchedIngredientRequest.ts
-models/PatchedInviteLinkRequest.ts
-models/PatchedKeywordRequest.ts
-models/PatchedMealPlanRequest.ts
-models/PatchedMealTypeRequest.ts
-models/PatchedPropertyRequest.ts
-models/PatchedPropertyTypeRequest.ts
-models/PatchedRecipeBookEntryRequest.ts
-models/PatchedRecipeBookRequest.ts
-models/PatchedRecipeRequest.ts
-models/PatchedShoppingListEntryRequest.ts
-models/PatchedShoppingListRecipeRequest.ts
-models/PatchedSpaceRequest.ts
-models/PatchedStepRequest.ts
-models/PatchedStorageRequest.ts
-models/PatchedSupermarketCategoryRelationRequest.ts
-models/PatchedSupermarketCategoryRequest.ts
-models/PatchedSupermarketRequest.ts
-models/PatchedSyncRequest.ts
-models/PatchedUnitConversionRequest.ts
-models/PatchedUnitRequest.ts
-models/PatchedUserPreferenceRequest.ts
-models/PatchedUserRequest.ts
-models/PatchedUserSpaceRequest.ts
-models/PatchedViewLogRequest.ts
+models/PatchedAccessToken.ts
+models/PatchedAutomation.ts
+models/PatchedBookmarkletImport.ts
+models/PatchedConnectorConfigConfig.ts
+models/PatchedCookLog.ts
+models/PatchedCustomFilter.ts
+models/PatchedExportLog.ts
+models/PatchedFood.ts
+models/PatchedImportLog.ts
+models/PatchedIngredient.ts
+models/PatchedInviteLink.ts
+models/PatchedKeyword.ts
+models/PatchedMealPlan.ts
+models/PatchedMealType.ts
+models/PatchedOpenDataCategory.ts
+models/PatchedOpenDataConversion.ts
+models/PatchedOpenDataFood.ts
+models/PatchedOpenDataProperty.ts
+models/PatchedOpenDataStore.ts
+models/PatchedOpenDataUnit.ts
+models/PatchedOpenDataVersion.ts
+models/PatchedProperty.ts
+models/PatchedPropertyType.ts
+models/PatchedRecipe.ts
+models/PatchedRecipeBook.ts
+models/PatchedRecipeBookEntry.ts
+models/PatchedShoppingListEntry.ts
+models/PatchedShoppingListRecipe.ts
+models/PatchedSpace.ts
+models/PatchedStep.ts
+models/PatchedStorage.ts
+models/PatchedSupermarket.ts
+models/PatchedSupermarketCategory.ts
+models/PatchedSupermarketCategoryRelation.ts
+models/PatchedSync.ts
+models/PatchedUnit.ts
+models/PatchedUnitConversion.ts
+models/PatchedUser.ts
+models/PatchedUserPreference.ts
+models/PatchedUserSpace.ts
+models/PatchedViewLog.ts
 models/Property.ts
-models/PropertyRequest.ts
 models/PropertyType.ts
-models/PropertyTypeRequest.ts
 models/Recipe.ts
 models/RecipeBook.ts
 models/RecipeBookEntry.ts
-models/RecipeBookEntryRequest.ts
-models/RecipeBookRequest.ts
 models/RecipeFlat.ts
 models/RecipeImage.ts
 models/RecipeOverview.ts
-models/RecipeOverviewRequest.ts
-models/RecipeRequest.ts
 models/RecipeShoppingUpdate.ts
-models/RecipeShoppingUpdateRequest.ts
 models/RecipeSimple.ts
-models/RecipeSimpleRequest.ts
 models/ShareLink.ts
 models/ShoppingListEntry.ts
 models/ShoppingListEntryBulk.ts
-models/ShoppingListEntryBulkRequest.ts
-models/ShoppingListEntryRequest.ts
 models/ShoppingListRecipe.ts
-models/ShoppingListRecipeRequest.ts
 models/Space.ts
 models/SpaceNavTextColorEnum.ts
 models/SpaceThemeEnum.ts
 models/Step.ts
-models/StepRequest.ts
 models/Storage.ts
-models/StorageRequest.ts
 models/Supermarket.ts
 models/SupermarketCategory.ts
 models/SupermarketCategoryRelation.ts
-models/SupermarketCategoryRelationRequest.ts
-models/SupermarketCategoryRequest.ts
-models/SupermarketRequest.ts
 models/Sync.ts
 models/SyncLog.ts
-models/SyncRequest.ts
 models/ThemeEnum.ts
-models/TypeEnum.ts
 models/Unit.ts
 models/UnitConversion.ts
-models/UnitConversionRequest.ts
-models/UnitRequest.ts
 models/User.ts
 models/UserFile.ts
 models/UserFileView.ts
-models/UserFileViewRequest.ts
 models/UserPreference.ts
 models/UserPreferenceNavTextColorEnum.ts
-models/UserRequest.ts
 models/UserSpace.ts
 models/ViewLog.ts
-models/ViewLogRequest.ts
 models/index.ts

vue3/src/openapi/apis/ApiTokenAuthApi.ts

@@ -25,6 +25,7 @@ import {
 export interface ApiTokenAuthCreateRequest {
     username: string;
     password: string;
+    token: string;
 }
 
 /**
@@ -49,6 +50,13 @@ export class ApiTokenAuthApi extends runtime.BaseAPI {
             );
         }
 
+        if (requestParameters['token'] == null) {
+            throw new runtime.RequiredError(
+                'token',
+                'Required parameter "token" was null or undefined when calling apiTokenAuthCreate().'
+            );
+        }
+
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -81,6 +89,10 @@ export class ApiTokenAuthApi extends runtime.BaseAPI {
             formParams.append('password', requestParameters['password'] as any);
         }
 
+        if (requestParameters['token'] != null) {
+            formParams.append('token', requestParameters['token'] as any);
+        }
+
         const response = await this.request({
             path: `/api-token-auth/`,
             method: 'POST',

vue3/src/openapi/models/AccessToken.ts

@@ -24,7 +24,7 @@ export interface AccessToken {
      * @type {number}
      * @memberof AccessToken
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -61,7 +61,6 @@ export interface AccessToken {
  * Check if a given object implements the AccessToken interface.
  */
 export function instanceOfAccessToken(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('token' in value)) return false;
     if (!('expires' in value)) return false;
     if (!('created' in value)) return false;
@@ -79,7 +78,7 @@ export function AccessTokenFromJSONTyped(json: any, ignoreDiscriminator: boolean
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'token': json['token'],
         'expires': (new Date(json['expires'])),
         'scope': json['scope'] == null ? undefined : json['scope'],
@@ -94,6 +93,7 @@ export function AccessTokenToJSON(value?: AccessToken | null): any {
     }
     return {
         
+        'id': value['id'],
         'expires': ((value['expires']).toISOString()),
         'scope': value['scope'],
     };

vue3/src/openapi/models/AuthToken.ts

@@ -19,6 +19,18 @@ import { mapValues } from '../runtime';
  * @interface AuthToken
  */
 export interface AuthToken {
+    /**
+     * 
+     * @type {string}
+     * @memberof AuthToken
+     */
+    username: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof AuthToken
+     */
+    password: string;
     /**
      * 
      * @type {string}
@@ -31,6 +43,8 @@ export interface AuthToken {
  * Check if a given object implements the AuthToken interface.
  */
 export function instanceOfAuthToken(value: object): boolean {
+    if (!('username' in value)) return false;
+    if (!('password' in value)) return false;
     if (!('token' in value)) return false;
     return true;
 }
@@ -45,6 +59,8 @@ export function AuthTokenFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     }
     return {
         
+        'username': json['username'],
+        'password': json['password'],
         'token': json['token'],
     };
 }
@@ -55,6 +71,8 @@ export function AuthTokenToJSON(value?: AuthToken | null): any {
     }
     return {
         
+        'username': value['username'],
+        'password': value['password'],
     };
 }
 

vue3/src/openapi/models/Automation.ts

@@ -13,12 +13,12 @@
  */
 
 import { mapValues } from '../runtime';
-import type { TypeEnum } from './TypeEnum';
+import type { AutomationTypeEnum } from './AutomationTypeEnum';
 import {
-    TypeEnumFromJSON,
-    TypeEnumFromJSONTyped,
-    TypeEnumToJSON,
-} from './TypeEnum';
+    AutomationTypeEnumFromJSON,
+    AutomationTypeEnumFromJSONTyped,
+    AutomationTypeEnumToJSON,
+} from './AutomationTypeEnum';
 
 /**
  * 
@@ -31,13 +31,13 @@ export interface Automation {
      * @type {number}
      * @memberof Automation
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
-     * @type {TypeEnum}
+     * @type {AutomationTypeEnum}
      * @memberof Automation
      */
-    type: TypeEnum;
+    type: AutomationTypeEnum;
     /**
      * 
      * @type {string}
@@ -92,7 +92,6 @@ export interface Automation {
  * Check if a given object implements the Automation interface.
  */
 export function instanceOfAutomation(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('type' in value)) return false;
     if (!('createdBy' in value)) return false;
     return true;
@@ -108,8 +107,8 @@ export function AutomationFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     }
     return {
         
-        'id': json['id'],
-        'type': TypeEnumFromJSON(json['type']),
+        'id': json['id'] == null ? undefined : json['id'],
+        'type': AutomationTypeEnumFromJSON(json['type']),
         'name': json['name'] == null ? undefined : json['name'],
         'description': json['description'] == null ? undefined : json['description'],
         'param1': json['param_1'] == null ? undefined : json['param_1'],
@@ -127,7 +126,8 @@ export function AutomationToJSON(value?: Automation | null): any {
     }
     return {
         
-        'type': TypeEnumToJSON(value['type']),
+        'id': value['id'],
+        'type': AutomationTypeEnumToJSON(value['type']),
         'name': value['name'],
         'description': value['description'],
         'param_1': value['param1'],

vue3/src/openapi/models/BookmarkletImport.ts

@@ -24,7 +24,7 @@ export interface BookmarkletImport {
      * @type {number}
      * @memberof BookmarkletImport
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -55,7 +55,6 @@ export interface BookmarkletImport {
  * Check if a given object implements the BookmarkletImport interface.
  */
 export function instanceOfBookmarkletImport(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('html' in value)) return false;
     if (!('createdBy' in value)) return false;
     if (!('createdAt' in value)) return false;
@@ -72,7 +71,7 @@ export function BookmarkletImportFromJSONTyped(json: any, ignoreDiscriminator: b
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'url': json['url'] == null ? undefined : json['url'],
         'html': json['html'],
         'createdBy': json['created_by'],
@@ -86,6 +85,7 @@ export function BookmarkletImportToJSON(value?: BookmarkletImport | null): any {
     }
     return {
         
+        'id': value['id'],
         'url': value['url'],
         'html': value['html'],
     };

vue3/src/openapi/models/BookmarkletImportList.ts

@@ -24,7 +24,7 @@ export interface BookmarkletImportList {
      * @type {number}
      * @memberof BookmarkletImportList
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -49,7 +49,6 @@ export interface BookmarkletImportList {
  * Check if a given object implements the BookmarkletImportList interface.
  */
 export function instanceOfBookmarkletImportList(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('createdBy' in value)) return false;
     if (!('createdAt' in value)) return false;
     return true;
@@ -65,7 +64,7 @@ export function BookmarkletImportListFromJSONTyped(json: any, ignoreDiscriminato
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'url': json['url'] == null ? undefined : json['url'],
         'createdBy': json['created_by'],
         'createdAt': (new Date(json['created_at'])),
@@ -78,6 +77,7 @@ export function BookmarkletImportListToJSON(value?: BookmarkletImportList | null
     }
     return {
         
+        'id': value['id'],
         'url': value['url'],
     };
 }

vue3/src/openapi/models/ConnectorConfigConfig.ts

@@ -24,7 +24,7 @@ export interface ConnectorConfigConfig {
      * @type {number}
      * @memberof ConnectorConfigConfig
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -37,6 +37,12 @@ export interface ConnectorConfigConfig {
      * @memberof ConnectorConfigConfig
      */
     url?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ConnectorConfigConfig
+     */
+    token?: string;
     /**
      * 
      * @type {string}
@@ -79,7 +85,6 @@ export interface ConnectorConfigConfig {
  * Check if a given object implements the ConnectorConfigConfig interface.
  */
 export function instanceOfConnectorConfigConfig(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('createdBy' in value)) return false;
     return true;
@@ -95,9 +100,10 @@ export function ConnectorConfigConfigFromJSONTyped(json: any, ignoreDiscriminato
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'url': json['url'] == null ? undefined : json['url'],
+        'token': json['token'] == null ? undefined : json['token'],
         'todoEntity': json['todo_entity'] == null ? undefined : json['todo_entity'],
         'enabled': json['enabled'] == null ? undefined : json['enabled'],
         'onShoppingListEntryCreatedEnabled': json['on_shopping_list_entry_created_enabled'] == null ? undefined : json['on_shopping_list_entry_created_enabled'],
@@ -113,8 +119,10 @@ export function ConnectorConfigConfigToJSON(value?: ConnectorConfigConfig | null
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'url': value['url'],
+        'token': value['token'],
         'todo_entity': value['todoEntity'],
         'enabled': value['enabled'],
         'on_shopping_list_entry_created_enabled': value['onShoppingListEntryCreatedEnabled'],

vue3/src/openapi/models/CookLog.ts

@@ -31,7 +31,7 @@ export interface CookLog {
      * @type {number}
      * @memberof CookLog
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -80,7 +80,6 @@ export interface CookLog {
  * Check if a given object implements the CookLog interface.
  */
 export function instanceOfCookLog(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('recipe' in value)) return false;
     if (!('createdBy' in value)) return false;
     if (!('updatedAt' in value)) return false;
@@ -97,7 +96,7 @@ export function CookLogFromJSONTyped(json: any, ignoreDiscriminator: boolean): C
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'recipe': json['recipe'],
         'servings': json['servings'] == null ? undefined : json['servings'],
         'rating': json['rating'] == null ? undefined : json['rating'],
@@ -114,6 +113,7 @@ export function CookLogToJSON(value?: CookLog | null): any {
     }
     return {
         
+        'id': value['id'],
         'recipe': value['recipe'],
         'servings': value['servings'],
         'rating': value['rating'],

vue3/src/openapi/models/CustomFilter.ts

@@ -31,7 +31,7 @@ export interface CustomFilter {
      * @type {number}
      * @memberof CustomFilter
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -62,7 +62,6 @@ export interface CustomFilter {
  * Check if a given object implements the CustomFilter interface.
  */
 export function instanceOfCustomFilter(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('search' in value)) return false;
     if (!('createdBy' in value)) return false;
@@ -79,7 +78,7 @@ export function CustomFilterFromJSONTyped(json: any, ignoreDiscriminator: boolea
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'search': json['search'],
         'shared': json['shared'] == null ? undefined : ((json['shared'] as Array<any>).map(UserFromJSON)),
@@ -93,6 +92,7 @@ export function CustomFilterToJSON(value?: CustomFilter | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'search': value['search'],
         'shared': value['shared'] == null ? undefined : ((value['shared'] as Array<any>).map(UserToJSON)),

vue3/src/openapi/models/ExportLog.ts

@@ -24,7 +24,7 @@ export interface ExportLog {
      * @type {number}
      * @memberof ExportLog
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -85,7 +85,6 @@ export interface ExportLog {
  * Check if a given object implements the ExportLog interface.
  */
 export function instanceOfExportLog(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('type' in value)) return false;
     if (!('createdBy' in value)) return false;
     if (!('createdAt' in value)) return false;
@@ -102,7 +101,7 @@ export function ExportLogFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'type': json['type'],
         'msg': json['msg'] == null ? undefined : json['msg'],
         'running': json['running'] == null ? undefined : json['running'],
@@ -121,6 +120,7 @@ export function ExportLogToJSON(value?: ExportLog | null): any {
     }
     return {
         
+        'id': value['id'],
         'type': value['type'],
         'msg': value['msg'],
         'running': value['running'],

vue3/src/openapi/models/Food.ts

@@ -95,7 +95,7 @@ export interface Food {
      * @type {number}
      * @memberof Food
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -241,7 +241,6 @@ export interface Food {
  * Check if a given object implements the Food interface.
  */
 export function instanceOfFood(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('shopping' in value)) return false;
     if (!('parent' in value)) return false;
@@ -261,7 +260,7 @@ export function FoodFromJSONTyped(json: any, ignoreDiscriminator: boolean): Food
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'pluralName': json['plural_name'] == null ? undefined : json['plural_name'],
         'description': json['description'] == null ? undefined : json['description'],
@@ -294,6 +293,7 @@ export function FoodToJSON(value?: Food | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'plural_name': value['pluralName'],
         'description': value['description'],

vue3/src/openapi/models/FoodInheritField.ts

@@ -58,7 +58,7 @@ export interface FoodInheritField {
      * @type {number}
      * @memberof FoodInheritField
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -77,7 +77,6 @@ export interface FoodInheritField {
  * Check if a given object implements the FoodInheritField interface.
  */
 export function instanceOfFoodInheritField(value: object): boolean {
-    if (!('id' in value)) return false;
     return true;
 }
 
@@ -91,7 +90,7 @@ export function FoodInheritFieldFromJSONTyped(json: any, ignoreDiscriminator: bo
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'] == null ? undefined : json['name'],
         'field': json['field'] == null ? undefined : json['field'],
     };
@@ -103,6 +102,7 @@ export function FoodInheritFieldToJSON(value?: FoodInheritField | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'field': value['field'],
     };

vue3/src/openapi/models/FoodShoppingUpdate.ts

@@ -13,6 +13,13 @@
  */
 
 import { mapValues } from '../runtime';
+import type { DeleteEnum } from './DeleteEnum';
+import {
+    DeleteEnumFromJSON,
+    DeleteEnumFromJSONTyped,
+    DeleteEnumToJSON,
+} from './DeleteEnum';
+
 /**
  * 
  * @export
@@ -24,14 +31,34 @@ export interface FoodShoppingUpdate {
      * @type {number}
      * @memberof FoodShoppingUpdate
      */
-    readonly id: number;
+    id?: number;
+    /**
+     * Amount of food to add to the shopping list
+     * @type {number}
+     * @memberof FoodShoppingUpdate
+     */
+    amount?: number;
+    /**
+     * ID of unit to use for the shopping list
+     * @type {number}
+     * @memberof FoodShoppingUpdate
+     */
+    unit?: number;
+    /**
+     * When set to true will delete all food from active shopping lists.
+     * 
+     * * `true` - true
+     * @type {DeleteEnum}
+     * @memberof FoodShoppingUpdate
+     */
+    _delete: DeleteEnum | null;
 }
 
 /**
  * Check if a given object implements the FoodShoppingUpdate interface.
  */
 export function instanceOfFoodShoppingUpdate(value: object): boolean {
-    if (!('id' in value)) return false;
+    if (!('_delete' in value)) return false;
     return true;
 }
 
@@ -45,7 +72,10 @@ export function FoodShoppingUpdateFromJSONTyped(json: any, ignoreDiscriminator:
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
+        'amount': json['amount'] == null ? undefined : json['amount'],
+        'unit': json['unit'] == null ? undefined : json['unit'],
+        '_delete': DeleteEnumFromJSON(json['delete']),
     };
 }
 
@@ -55,6 +85,10 @@ export function FoodShoppingUpdateToJSON(value?: FoodShoppingUpdate | null): any
     }
     return {
         
+        'id': value['id'],
+        'amount': value['amount'],
+        'unit': value['unit'],
+        'delete': DeleteEnumToJSON(value['_delete']),
     };
 }
 

vue3/src/openapi/models/FoodSimple.ts

@@ -24,7 +24,7 @@ export interface FoodSimple {
      * @type {number}
      * @memberof FoodSimple
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -43,7 +43,6 @@ export interface FoodSimple {
  * Check if a given object implements the FoodSimple interface.
  */
 export function instanceOfFoodSimple(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     return true;
 }
@@ -58,7 +57,7 @@ export function FoodSimpleFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'pluralName': json['plural_name'] == null ? undefined : json['plural_name'],
     };
@@ -70,6 +69,7 @@ export function FoodSimpleToJSON(value?: FoodSimple | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'plural_name': value['pluralName'],
     };

vue3/src/openapi/models/Group.ts

@@ -58,7 +58,7 @@ export interface Group {
      * @type {number}
      * @memberof Group
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -71,7 +71,6 @@ export interface Group {
  * Check if a given object implements the Group interface.
  */
 export function instanceOfGroup(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     return true;
 }
@@ -86,7 +85,7 @@ export function GroupFromJSONTyped(json: any, ignoreDiscriminator: boolean): Gro
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
     };
 }
@@ -97,6 +96,7 @@ export function GroupToJSON(value?: Group | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
     };
 }

vue3/src/openapi/models/ImportLog.ts

@@ -31,7 +31,7 @@ export interface ImportLog {
      * @type {number}
      * @memberof ImportLog
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -86,7 +86,6 @@ export interface ImportLog {
  * Check if a given object implements the ImportLog interface.
  */
 export function instanceOfImportLog(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('type' in value)) return false;
     if (!('keyword' in value)) return false;
     if (!('createdBy' in value)) return false;
@@ -104,7 +103,7 @@ export function ImportLogFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'type': json['type'],
         'msg': json['msg'] == null ? undefined : json['msg'],
         'running': json['running'] == null ? undefined : json['running'],
@@ -122,6 +121,7 @@ export function ImportLogToJSON(value?: ImportLog | null): any {
     }
     return {
         
+        'id': value['id'],
         'type': value['type'],
         'msg': value['msg'],
         'running': value['running'],

vue3/src/openapi/models/Ingredient.ts

@@ -37,7 +37,7 @@ export interface Ingredient {
      * @type {number}
      * @memberof Ingredient
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {Food}
@@ -116,7 +116,6 @@ export interface Ingredient {
  * Check if a given object implements the Ingredient interface.
  */
 export function instanceOfIngredient(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('food' in value)) return false;
     if (!('unit' in value)) return false;
     if (!('amount' in value)) return false;
@@ -135,7 +134,7 @@ export function IngredientFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'food': FoodFromJSON(json['food']),
         'unit': UnitFromJSON(json['unit']),
         'amount': json['amount'],
@@ -157,6 +156,7 @@ export function IngredientToJSON(value?: Ingredient | null): any {
     }
     return {
         
+        'id': value['id'],
         'food': FoodToJSON(value['food']),
         'unit': UnitToJSON(value['unit']),
         'amount': value['amount'],

vue3/src/openapi/models/IngredientString.ts

@@ -0,0 +1,61 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Tandoor
+ * Tandoor API Docs
+ *
+ * The version of the OpenAPI document: 0.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface IngredientString
+ */
+export interface IngredientString {
+    /**
+     * 
+     * @type {string}
+     * @memberof IngredientString
+     */
+    text: string;
+}
+
+/**
+ * Check if a given object implements the IngredientString interface.
+ */
+export function instanceOfIngredientString(value: object): boolean {
+    if (!('text' in value)) return false;
+    return true;
+}
+
+export function IngredientStringFromJSON(json: any): IngredientString {
+    return IngredientStringFromJSONTyped(json, false);
+}
+
+export function IngredientStringFromJSONTyped(json: any, ignoreDiscriminator: boolean): IngredientString {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'text': json['text'],
+    };
+}
+
+export function IngredientStringToJSON(value?: IngredientString | null): any {
+    if (value == null) {
+        return value;
+    }
+    return {
+        
+        'text': value['text'],
+    };
+}
+

vue3/src/openapi/models/InviteLink.ts

@@ -31,7 +31,7 @@ export interface InviteLink {
      * @type {number}
      * @memberof InviteLink
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -92,7 +92,6 @@ export interface InviteLink {
  * Check if a given object implements the InviteLink interface.
  */
 export function instanceOfInviteLink(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('uuid' in value)) return false;
     if (!('group' in value)) return false;
     if (!('createdBy' in value)) return false;
@@ -110,7 +109,7 @@ export function InviteLinkFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'uuid': json['uuid'],
         'email': json['email'] == null ? undefined : json['email'],
         'group': GroupFromJSON(json['group']),
@@ -129,6 +128,7 @@ export function InviteLinkToJSON(value?: InviteLink | null): any {
     }
     return {
         
+        'id': value['id'],
         'email': value['email'],
         'group': GroupToJSON(value['group']),
         'valid_until': value['validUntil'] == null ? undefined : ((value['validUntil']).toISOString().substring(0,10)),

vue3/src/openapi/models/Keyword.ts

@@ -58,7 +58,7 @@ export interface Keyword {
      * @type {number}
      * @memberof Keyword
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -114,7 +114,6 @@ export interface Keyword {
  * Check if a given object implements the Keyword interface.
  */
 export function instanceOfKeyword(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('label' in value)) return false;
     if (!('parent' in value)) return false;
@@ -135,7 +134,7 @@ export function KeywordFromJSONTyped(json: any, ignoreDiscriminator: boolean): K
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'label': json['label'],
         'description': json['description'] == null ? undefined : json['description'],
@@ -153,6 +152,7 @@ export function KeywordToJSON(value?: Keyword | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
     };

vue3/src/openapi/models/KeywordLabel.ts

@@ -24,7 +24,7 @@ export interface KeywordLabel {
      * @type {number}
      * @memberof KeywordLabel
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -37,7 +37,6 @@ export interface KeywordLabel {
  * Check if a given object implements the KeywordLabel interface.
  */
 export function instanceOfKeywordLabel(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('label' in value)) return false;
     return true;
 }
@@ -52,7 +51,7 @@ export function KeywordLabelFromJSONTyped(json: any, ignoreDiscriminator: boolea
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'label': json['label'],
     };
 }
@@ -63,6 +62,7 @@ export function KeywordLabelToJSON(value?: KeywordLabel | null): any {
     }
     return {
         
+        'id': value['id'],
     };
 }
 

vue3/src/openapi/models/MealPlan.ts

@@ -43,7 +43,7 @@ export interface MealPlan {
      * @type {number}
      * @memberof MealPlan
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -128,7 +128,6 @@ export interface MealPlan {
  * Check if a given object implements the MealPlan interface.
  */
 export function instanceOfMealPlan(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('servings' in value)) return false;
     if (!('noteMarkdown' in value)) return false;
     if (!('fromDate' in value)) return false;
@@ -150,7 +149,7 @@ export function MealPlanFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'title': json['title'] == null ? undefined : json['title'],
         'recipe': json['recipe'] == null ? undefined : RecipeOverviewFromJSON(json['recipe']),
         'servings': json['servings'],
@@ -173,6 +172,7 @@ export function MealPlanToJSON(value?: MealPlan | null): any {
     }
     return {
         
+        'id': value['id'],
         'title': value['title'],
         'recipe': RecipeOverviewToJSON(value['recipe']),
         'servings': value['servings'],

vue3/src/openapi/models/MealType.ts

@@ -24,7 +24,7 @@ export interface MealType {
      * @type {number}
      * @memberof MealType
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -61,7 +61,6 @@ export interface MealType {
  * Check if a given object implements the MealType interface.
  */
 export function instanceOfMealType(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('createdBy' in value)) return false;
     return true;
@@ -77,7 +76,7 @@ export function MealTypeFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'order': json['order'] == null ? undefined : json['order'],
         'color': json['color'] == null ? undefined : json['color'],
@@ -92,6 +91,7 @@ export function MealTypeToJSON(value?: MealType | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'order': value['order'],
         'color': value['color'],

vue3/src/openapi/models/NutritionInformation.ts

@@ -24,7 +24,7 @@ export interface NutritionInformation {
      * @type {number}
      * @memberof NutritionInformation
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -61,7 +61,6 @@ export interface NutritionInformation {
  * Check if a given object implements the NutritionInformation interface.
  */
 export function instanceOfNutritionInformation(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('carbohydrates' in value)) return false;
     if (!('fats' in value)) return false;
     if (!('proteins' in value)) return false;
@@ -79,7 +78,7 @@ export function NutritionInformationFromJSONTyped(json: any, ignoreDiscriminator
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'carbohydrates': json['carbohydrates'],
         'fats': json['fats'],
         'proteins': json['proteins'],
@@ -94,6 +93,7 @@ export function NutritionInformationToJSON(value?: NutritionInformation | null):
     }
     return {
         
+        'id': value['id'],
         'carbohydrates': value['carbohydrates'],
         'fats': value['fats'],
         'proteins': value['proteins'],

vue3/src/openapi/models/OpenDataCategory.ts

@@ -65,7 +65,7 @@ export interface OpenDataCategory {
      * @type {number}
      * @memberof OpenDataCategory
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -108,7 +108,6 @@ export interface OpenDataCategory {
  * Check if a given object implements the OpenDataCategory interface.
  */
 export function instanceOfOpenDataCategory(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('version' in value)) return false;
     if (!('slug' in value)) return false;
     if (!('name' in value)) return false;
@@ -126,7 +125,7 @@ export function OpenDataCategoryFromJSONTyped(json: any, ignoreDiscriminator: bo
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'version': OpenDataVersionFromJSON(json['version']),
         'slug': json['slug'],
         'name': json['name'],
@@ -142,6 +141,7 @@ export function OpenDataCategoryToJSON(value?: OpenDataCategory | null): any {
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'name': value['name'],

vue3/src/openapi/models/OpenDataConversion.ts

@@ -43,7 +43,7 @@ export interface OpenDataConversion {
      * @type {number}
      * @memberof OpenDataConversion
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -64,10 +64,10 @@ export interface OpenDataConversion {
     food: OpenDataFood;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof OpenDataConversion
      */
-    baseAmount: string;
+    baseAmount: number;
     /**
      * 
      * @type {OpenDataUnit}
@@ -76,10 +76,10 @@ export interface OpenDataConversion {
     baseUnit: OpenDataUnit;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof OpenDataConversion
      */
-    convertedAmount: string;
+    convertedAmount: number;
     /**
      * 
      * @type {OpenDataUnit}
@@ -110,7 +110,6 @@ export interface OpenDataConversion {
  * Check if a given object implements the OpenDataConversion interface.
  */
 export function instanceOfOpenDataConversion(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('version' in value)) return false;
     if (!('slug' in value)) return false;
     if (!('food' in value)) return false;
@@ -133,7 +132,7 @@ export function OpenDataConversionFromJSONTyped(json: any, ignoreDiscriminator:
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'version': OpenDataVersionFromJSON(json['version']),
         'slug': json['slug'],
         'food': OpenDataFoodFromJSON(json['food']),
@@ -153,6 +152,7 @@ export function OpenDataConversionToJSON(value?: OpenDataConversion | null): any
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'food': OpenDataFoodToJSON(value['food']),

vue3/src/openapi/models/OpenDataFood.ts

@@ -83,7 +83,7 @@ export interface OpenDataFood {
      * @type {number}
      * @memberof OpenDataFood
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -186,7 +186,6 @@ export interface OpenDataFood {
  * Check if a given object implements the OpenDataFood interface.
  */
 export function instanceOfOpenDataFood(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('version' in value)) return false;
     if (!('slug' in value)) return false;
     if (!('name' in value)) return false;
@@ -209,7 +208,7 @@ export function OpenDataFoodFromJSONTyped(json: any, ignoreDiscriminator: boolea
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'version': OpenDataVersionFromJSON(json['version']),
         'slug': json['slug'],
         'name': json['name'],
@@ -235,6 +234,7 @@ export function OpenDataFoodToJSON(value?: OpenDataFood | null): any {
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'name': value['name'],

vue3/src/openapi/models/OpenDataFoodProperty.ts

@@ -31,7 +31,7 @@ export interface OpenDataFoodProperty {
      * @type {number}
      * @memberof OpenDataFoodProperty
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataProperty}
@@ -40,17 +40,16 @@ export interface OpenDataFoodProperty {
     property: OpenDataProperty;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof OpenDataFoodProperty
      */
-    propertyAmount: string;
+    propertyAmount: number;
 }
 
 /**
  * Check if a given object implements the OpenDataFoodProperty interface.
  */
 export function instanceOfOpenDataFoodProperty(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('property' in value)) return false;
     if (!('propertyAmount' in value)) return false;
     return true;
@@ -66,7 +65,7 @@ export function OpenDataFoodPropertyFromJSONTyped(json: any, ignoreDiscriminator
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'property': OpenDataPropertyFromJSON(json['property']),
         'propertyAmount': json['property_amount'],
     };
@@ -78,6 +77,7 @@ export function OpenDataFoodPropertyToJSON(value?: OpenDataFoodProperty | null):
     }
     return {
         
+        'id': value['id'],
         'property': OpenDataPropertyToJSON(value['property']),
         'property_amount': value['propertyAmount'],
     };

vue3/src/openapi/models/OpenDataProperty.ts

@@ -65,7 +65,7 @@ export interface OpenDataProperty {
      * @type {number}
      * @memberof OpenDataProperty
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -114,7 +114,6 @@ export interface OpenDataProperty {
  * Check if a given object implements the OpenDataProperty interface.
  */
 export function instanceOfOpenDataProperty(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('version' in value)) return false;
     if (!('slug' in value)) return false;
     if (!('name' in value)) return false;
@@ -132,7 +131,7 @@ export function OpenDataPropertyFromJSONTyped(json: any, ignoreDiscriminator: bo
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'version': OpenDataVersionFromJSON(json['version']),
         'slug': json['slug'],
         'name': json['name'],
@@ -149,6 +148,7 @@ export function OpenDataPropertyToJSON(value?: OpenDataProperty | null): any {
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'name': value['name'],

vue3/src/openapi/models/OpenDataStore.ts

@@ -37,7 +37,7 @@ export interface OpenDataStore {
      * @type {number}
      * @memberof OpenDataStore
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -80,7 +80,6 @@ export interface OpenDataStore {
  * Check if a given object implements the OpenDataStore interface.
  */
 export function instanceOfOpenDataStore(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('version' in value)) return false;
     if (!('slug' in value)) return false;
     if (!('name' in value)) return false;
@@ -99,7 +98,7 @@ export function OpenDataStoreFromJSONTyped(json: any, ignoreDiscriminator: boole
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'version': OpenDataVersionFromJSON(json['version']),
         'slug': json['slug'],
         'name': json['name'],
@@ -115,6 +114,7 @@ export function OpenDataStoreToJSON(value?: OpenDataStore | null): any {
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'name': value['name'],

vue3/src/openapi/models/OpenDataStoreCategory.ts

@@ -31,7 +31,7 @@ export interface OpenDataStoreCategory {
      * @type {number}
      * @memberof OpenDataStoreCategory
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataCategory}
@@ -56,7 +56,6 @@ export interface OpenDataStoreCategory {
  * Check if a given object implements the OpenDataStoreCategory interface.
  */
 export function instanceOfOpenDataStoreCategory(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('category' in value)) return false;
     if (!('store' in value)) return false;
     return true;
@@ -72,7 +71,7 @@ export function OpenDataStoreCategoryFromJSONTyped(json: any, ignoreDiscriminato
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'category': OpenDataCategoryFromJSON(json['category']),
         'store': json['store'],
         'order': json['order'] == null ? undefined : json['order'],
@@ -85,6 +84,7 @@ export function OpenDataStoreCategoryToJSON(value?: OpenDataStoreCategory | null
     }
     return {
         
+        'id': value['id'],
         'category': OpenDataCategoryToJSON(value['category']),
         'store': value['store'],
         'order': value['order'],

vue3/src/openapi/models/OpenDataUnit.ts

@@ -77,7 +77,7 @@ export interface OpenDataUnit {
      * @type {number}
      * @memberof OpenDataUnit
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -132,7 +132,6 @@ export interface OpenDataUnit {
  * Check if a given object implements the OpenDataUnit interface.
  */
 export function instanceOfOpenDataUnit(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('version' in value)) return false;
     if (!('slug' in value)) return false;
     if (!('name' in value)) return false;
@@ -151,7 +150,7 @@ export function OpenDataUnitFromJSONTyped(json: any, ignoreDiscriminator: boolea
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'version': OpenDataVersionFromJSON(json['version']),
         'slug': json['slug'],
         'name': json['name'],
@@ -169,6 +168,7 @@ export function OpenDataUnitToJSON(value?: OpenDataUnit | null): any {
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'name': value['name'],

vue3/src/openapi/models/OpenDataVersion.ts

@@ -58,7 +58,7 @@ export interface OpenDataVersion {
      * @type {number}
      * @memberof OpenDataVersion
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -83,7 +83,6 @@ export interface OpenDataVersion {
  * Check if a given object implements the OpenDataVersion interface.
  */
 export function instanceOfOpenDataVersion(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('code' in value)) return false;
     return true;
@@ -99,7 +98,7 @@ export function OpenDataVersionFromJSONTyped(json: any, ignoreDiscriminator: boo
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'code': json['code'],
         'comment': json['comment'] == null ? undefined : json['comment'],
@@ -112,6 +111,7 @@ export function OpenDataVersionToJSON(value?: OpenDataVersion | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'code': value['code'],
         'comment': value['comment'],

vue3/src/openapi/models/PatchedAccessToken.ts

@@ -24,7 +24,7 @@ export interface PatchedAccessToken {
      * @type {number}
      * @memberof PatchedAccessToken
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -89,6 +89,7 @@ export function PatchedAccessTokenToJSON(value?: PatchedAccessToken | null): any
     }
     return {
         
+        'id': value['id'],
         'expires': value['expires'] == null ? undefined : ((value['expires']).toISOString()),
         'scope': value['scope'],
     };

vue3/src/openapi/models/PatchedAutomation.ts

@@ -31,7 +31,7 @@ export interface PatchedAutomation {
      * @type {number}
      * @memberof PatchedAutomation
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {AutomationTypeEnum}
@@ -124,6 +124,7 @@ export function PatchedAutomationToJSON(value?: PatchedAutomation | null): any {
     }
     return {
         
+        'id': value['id'],
         'type': AutomationTypeEnumToJSON(value['type']),
         'name': value['name'],
         'description': value['description'],

vue3/src/openapi/models/PatchedBookmarkletImport.ts

@@ -24,7 +24,7 @@ export interface PatchedBookmarkletImport {
      * @type {number}
      * @memberof PatchedBookmarkletImport
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -82,6 +82,7 @@ export function PatchedBookmarkletImportToJSON(value?: PatchedBookmarkletImport
     }
     return {
         
+        'id': value['id'],
         'url': value['url'],
         'html': value['html'],
     };

vue3/src/openapi/models/PatchedConnectorConfigConfig.ts

@@ -24,7 +24,7 @@ export interface PatchedConnectorConfigConfig {
      * @type {number}
      * @memberof PatchedConnectorConfigConfig
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -117,6 +117,7 @@ export function PatchedConnectorConfigConfigToJSON(value?: PatchedConnectorConfi
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'url': value['url'],
         'token': value['token'],

vue3/src/openapi/models/PatchedCookLog.ts

@@ -31,7 +31,7 @@ export interface PatchedCookLog {
      * @type {number}
      * @memberof PatchedCookLog
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -110,6 +110,7 @@ export function PatchedCookLogToJSON(value?: PatchedCookLog | null): any {
     }
     return {
         
+        'id': value['id'],
         'recipe': value['recipe'],
         'servings': value['servings'],
         'rating': value['rating'],

vue3/src/openapi/models/PatchedCustomFilter.ts

@@ -31,7 +31,7 @@ export interface PatchedCustomFilter {
      * @type {number}
      * @memberof PatchedCustomFilter
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -89,6 +89,7 @@ export function PatchedCustomFilterToJSON(value?: PatchedCustomFilter | null): a
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'search': value['search'],
         'shared': value['shared'] == null ? undefined : ((value['shared'] as Array<any>).map(UserToJSON)),

vue3/src/openapi/models/PatchedExportLog.ts

@@ -24,7 +24,7 @@ export interface PatchedExportLog {
      * @type {number}
      * @memberof PatchedExportLog
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -117,6 +117,7 @@ export function PatchedExportLogToJSON(value?: PatchedExportLog | null): any {
     }
     return {
         
+        'id': value['id'],
         'type': value['type'],
         'msg': value['msg'],
         'running': value['running'],

vue3/src/openapi/models/PatchedFood.ts

@@ -95,7 +95,7 @@ export interface PatchedFood {
      * @type {number}
      * @memberof PatchedFood
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -140,10 +140,10 @@ export interface PatchedFood {
     properties?: Array<Property>;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedFood
      */
-    propertiesFoodAmount?: string;
+    propertiesFoodAmount?: number;
     /**
      * 
      * @type {Unit}
@@ -158,10 +158,10 @@ export interface PatchedFood {
     fdcId?: number;
     /**
      * 
-     * @type {string}
+     * @type {boolean}
      * @memberof PatchedFood
      */
-    foodOnhand?: string;
+    foodOnhand?: boolean;
     /**
      * 
      * @type {SupermarketCategory}
@@ -170,10 +170,10 @@ export interface PatchedFood {
     supermarketCategory?: SupermarketCategory;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedFood
      */
-    readonly parent?: string;
+    readonly parent?: number;
     /**
      * 
      * @type {number}
@@ -187,7 +187,8 @@ export interface PatchedFood {
      */
     inheritFields?: Array<FoodInheritField>;
     /**
-     * 
+     * Returns a string representation of a tree node and it's ancestors,
+     * e.g. 'Cuisine > Asian > Chinese > Catonese'.
      * @type {string}
      * @memberof PatchedFood
      */
@@ -218,10 +219,10 @@ export interface PatchedFood {
     substituteChildren?: boolean;
     /**
      * 
-     * @type {string}
+     * @type {boolean}
      * @memberof PatchedFood
      */
-    readonly substituteOnhand?: string;
+    readonly substituteOnhand?: boolean;
     /**
      * 
      * @type {Array<FoodInheritField>}
@@ -286,6 +287,7 @@ export function PatchedFoodToJSON(value?: PatchedFood | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'plural_name': value['pluralName'],
         'description': value['description'],

vue3/src/openapi/models/PatchedImportLog.ts

@@ -31,7 +31,7 @@ export interface PatchedImportLog {
      * @type {number}
      * @memberof PatchedImportLog
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -117,6 +117,7 @@ export function PatchedImportLogToJSON(value?: PatchedImportLog | null): any {
     }
     return {
         
+        'id': value['id'],
         'type': value['type'],
         'msg': value['msg'],
         'running': value['running'],

vue3/src/openapi/models/PatchedIngredient.ts

@@ -37,7 +37,7 @@ export interface PatchedIngredient {
      * @type {number}
      * @memberof PatchedIngredient
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {Food}
@@ -52,16 +52,16 @@ export interface PatchedIngredient {
     unit?: Unit;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedIngredient
      */
-    amount?: string;
+    amount?: number;
     /**
      * 
-     * @type {string}
+     * @type {Array<any>}
      * @memberof PatchedIngredient
      */
-    readonly conversions?: string;
+    readonly conversions?: Array<any>;
     /**
      * 
      * @type {string}
@@ -94,10 +94,10 @@ export interface PatchedIngredient {
     originalText?: string;
     /**
      * 
-     * @type {string}
+     * @type {Array<any>}
      * @memberof PatchedIngredient
      */
-    readonly usedInRecipes?: string;
+    readonly usedInRecipes?: Array<any>;
     /**
      * 
      * @type {boolean}
@@ -151,6 +151,7 @@ export function PatchedIngredientToJSON(value?: PatchedIngredient | null): any {
     }
     return {
         
+        'id': value['id'],
         'food': FoodToJSON(value['food']),
         'unit': UnitToJSON(value['unit']),
         'amount': value['amount'],

vue3/src/openapi/models/PatchedInviteLink.ts

@@ -31,7 +31,7 @@ export interface PatchedInviteLink {
      * @type {number}
      * @memberof PatchedInviteLink
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -124,6 +124,7 @@ export function PatchedInviteLinkToJSON(value?: PatchedInviteLink | null): any {
     }
     return {
         
+        'id': value['id'],
         'email': value['email'],
         'group': GroupToJSON(value['group']),
         'valid_until': value['validUntil'] == null ? undefined : ((value['validUntil']).toISOString().substring(0,10)),

vue3/src/openapi/models/PatchedKeyword.ts

@@ -58,7 +58,7 @@ export interface PatchedKeyword {
      * @type {number}
      * @memberof PatchedKeyword
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -79,10 +79,10 @@ export interface PatchedKeyword {
     description?: string;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedKeyword
      */
-    readonly parent?: string;
+    readonly parent?: number;
     /**
      * 
      * @type {number}
@@ -102,7 +102,8 @@ export interface PatchedKeyword {
      */
     readonly updatedAt?: Date;
     /**
-     * 
+     * Returns a string representation of a tree node and it's ancestors,
+     * e.g. 'Cuisine > Asian > Chinese > Catonese'.
      * @type {string}
      * @memberof PatchedKeyword
      */
@@ -144,6 +145,7 @@ export function PatchedKeywordToJSON(value?: PatchedKeyword | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
     };

vue3/src/openapi/models/PatchedMealPlan.ts

@@ -43,7 +43,7 @@ export interface PatchedMealPlan {
      * @type {number}
      * @memberof PatchedMealPlan
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -58,10 +58,10 @@ export interface PatchedMealPlan {
     recipe?: RecipeOverview;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedMealPlan
      */
-    servings?: string;
+    servings?: number;
     /**
      * 
      * @type {string}
@@ -118,10 +118,10 @@ export interface PatchedMealPlan {
     readonly mealTypeName?: string;
     /**
      * 
-     * @type {string}
+     * @type {boolean}
      * @memberof PatchedMealPlan
      */
-    readonly shopping?: string;
+    readonly shopping?: boolean;
 }
 
 /**
@@ -164,6 +164,7 @@ export function PatchedMealPlanToJSON(value?: PatchedMealPlan | null): any {
     }
     return {
         
+        'id': value['id'],
         'title': value['title'],
         'recipe': RecipeOverviewToJSON(value['recipe']),
         'servings': value['servings'],

vue3/src/openapi/models/PatchedMealType.ts

@@ -24,7 +24,7 @@ export interface PatchedMealType {
      * @type {number}
      * @memberof PatchedMealType
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -89,6 +89,7 @@ export function PatchedMealTypeToJSON(value?: PatchedMealType | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'order': value['order'],
         'color': value['color'],

vue3/src/openapi/models/PatchedOpenDataCategory.ts

@@ -65,7 +65,7 @@ export interface PatchedOpenDataCategory {
      * @type {number}
      * @memberof PatchedOpenDataCategory
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -137,6 +137,7 @@ export function PatchedOpenDataCategoryToJSON(value?: PatchedOpenDataCategory |
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'name': value['name'],

vue3/src/openapi/models/PatchedOpenDataConversion.ts

@@ -43,7 +43,7 @@ export interface PatchedOpenDataConversion {
      * @type {number}
      * @memberof PatchedOpenDataConversion
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -64,10 +64,10 @@ export interface PatchedOpenDataConversion {
     food?: OpenDataFood;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedOpenDataConversion
      */
-    baseAmount?: string;
+    baseAmount?: number;
     /**
      * 
      * @type {OpenDataUnit}
@@ -76,10 +76,10 @@ export interface PatchedOpenDataConversion {
     baseUnit?: OpenDataUnit;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedOpenDataConversion
      */
-    convertedAmount?: string;
+    convertedAmount?: number;
     /**
      * 
      * @type {OpenDataUnit}
@@ -143,6 +143,7 @@ export function PatchedOpenDataConversionToJSON(value?: PatchedOpenDataConversio
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'food': OpenDataFoodToJSON(value['food']),

vue3/src/openapi/models/PatchedOpenDataFood.ts

@@ -83,7 +83,7 @@ export interface PatchedOpenDataFood {
      * @type {number}
      * @memberof PatchedOpenDataFood
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -225,6 +225,7 @@ export function PatchedOpenDataFoodToJSON(value?: PatchedOpenDataFood | null): a
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'name': value['name'],

vue3/src/openapi/models/PatchedOpenDataProperty.ts

@@ -65,7 +65,7 @@ export interface PatchedOpenDataProperty {
      * @type {number}
      * @memberof PatchedOpenDataProperty
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -144,6 +144,7 @@ export function PatchedOpenDataPropertyToJSON(value?: PatchedOpenDataProperty |
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'name': value['name'],

vue3/src/openapi/models/PatchedOpenDataStore.ts

@@ -37,7 +37,7 @@ export interface PatchedOpenDataStore {
      * @type {number}
      * @memberof PatchedOpenDataStore
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -109,6 +109,7 @@ export function PatchedOpenDataStoreToJSON(value?: PatchedOpenDataStore | null):
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'name': value['name'],

vue3/src/openapi/models/PatchedOpenDataUnit.ts

@@ -77,7 +77,7 @@ export interface PatchedOpenDataUnit {
      * @type {number}
      * @memberof PatchedOpenDataUnit
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {OpenDataVersion}
@@ -163,6 +163,7 @@ export function PatchedOpenDataUnitToJSON(value?: PatchedOpenDataUnit | null): a
     }
     return {
         
+        'id': value['id'],
         'version': OpenDataVersionToJSON(value['version']),
         'slug': value['slug'],
         'name': value['name'],

vue3/src/openapi/models/PatchedOpenDataVersion.ts

@@ -58,7 +58,7 @@ export interface PatchedOpenDataVersion {
      * @type {number}
      * @memberof PatchedOpenDataVersion
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -109,6 +109,7 @@ export function PatchedOpenDataVersionToJSON(value?: PatchedOpenDataVersion | nu
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'code': value['code'],
         'comment': value['comment'],

vue3/src/openapi/models/PatchedProperty.ts

@@ -65,13 +65,13 @@ export interface PatchedProperty {
      * @type {number}
      * @memberof PatchedProperty
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedProperty
      */
-    propertyAmount?: string;
+    propertyAmount?: number;
     /**
      * 
      * @type {PropertyType}
@@ -109,6 +109,7 @@ export function PatchedPropertyToJSON(value?: PatchedProperty | null): any {
     }
     return {
         
+        'id': value['id'],
         'property_amount': value['propertyAmount'],
         'property_type': PropertyTypeToJSON(value['propertyType']),
     };

vue3/src/openapi/models/PatchedRecipe.ts

@@ -55,7 +55,7 @@ export interface PatchedRecipe {
      * @type {number}
      * @memberof PatchedRecipe
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -148,10 +148,10 @@ export interface PatchedRecipe {
     properties?: Array<Property>;
     /**
      * 
-     * @type {string}
+     * @type {any}
      * @memberof PatchedRecipe
      */
-    readonly foodProperties?: string;
+    readonly foodProperties?: any;
     /**
      * 
      * @type {number}
@@ -172,10 +172,10 @@ export interface PatchedRecipe {
     servingsText?: string;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedRecipe
      */
-    readonly rating?: string;
+    readonly rating?: number;
     /**
      * 
      * @type {Date}
@@ -246,6 +246,7 @@ export function PatchedRecipeToJSON(value?: PatchedRecipe | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
         'keywords': value['keywords'] == null ? undefined : ((value['keywords'] as Array<any>).map(KeywordToJSON)),

vue3/src/openapi/models/PatchedRecipeBook.ts

@@ -37,7 +37,7 @@ export interface PatchedRecipeBook {
      * @type {number}
      * @memberof PatchedRecipeBook
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -109,6 +109,7 @@ export function PatchedRecipeBookToJSON(value?: PatchedRecipeBook | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
         'shared': value['shared'] == null ? undefined : ((value['shared'] as Array<any>).map(UserToJSON)),

vue3/src/openapi/models/PatchedRecipeBookEntry.ts

@@ -13,6 +13,19 @@
  */
 
 import { mapValues } from '../runtime';
+import type { RecipeBook } from './RecipeBook';
+import {
+    RecipeBookFromJSON,
+    RecipeBookFromJSONTyped,
+    RecipeBookToJSON,
+} from './RecipeBook';
+import type { RecipeOverview } from './RecipeOverview';
+import {
+    RecipeOverviewFromJSON,
+    RecipeOverviewFromJSONTyped,
+    RecipeOverviewToJSON,
+} from './RecipeOverview';
+
 /**
  * 
  * @export
@@ -24,7 +37,7 @@ export interface PatchedRecipeBookEntry {
      * @type {number}
      * @memberof PatchedRecipeBookEntry
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -33,10 +46,10 @@ export interface PatchedRecipeBookEntry {
     book?: number;
     /**
      * 
-     * @type {string}
+     * @type {RecipeBook}
      * @memberof PatchedRecipeBookEntry
      */
-    readonly bookContent?: string;
+    readonly bookContent?: RecipeBook;
     /**
      * 
      * @type {number}
@@ -45,10 +58,10 @@ export interface PatchedRecipeBookEntry {
     recipe?: number;
     /**
      * 
-     * @type {string}
+     * @type {RecipeOverview}
      * @memberof PatchedRecipeBookEntry
      */
-    readonly recipeContent?: string;
+    readonly recipeContent?: RecipeOverview;
 }
 
 /**
@@ -70,9 +83,9 @@ export function PatchedRecipeBookEntryFromJSONTyped(json: any, ignoreDiscriminat
         
         'id': json['id'] == null ? undefined : json['id'],
         'book': json['book'] == null ? undefined : json['book'],
-        'bookContent': json['book_content'] == null ? undefined : json['book_content'],
+        'bookContent': json['book_content'] == null ? undefined : RecipeBookFromJSON(json['book_content']),
         'recipe': json['recipe'] == null ? undefined : json['recipe'],
-        'recipeContent': json['recipe_content'] == null ? undefined : json['recipe_content'],
+        'recipeContent': json['recipe_content'] == null ? undefined : RecipeOverviewFromJSON(json['recipe_content']),
     };
 }
 
@@ -82,6 +95,7 @@ export function PatchedRecipeBookEntryToJSON(value?: PatchedRecipeBookEntry | nu
     }
     return {
         
+        'id': value['id'],
         'book': value['book'],
         'recipe': value['recipe'],
     };

vue3/src/openapi/models/PatchedShoppingListEntry.ts

@@ -49,7 +49,7 @@ export interface PatchedShoppingListEntry {
      * @type {number}
      * @memberof PatchedShoppingListEntry
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -70,10 +70,10 @@ export interface PatchedShoppingListEntry {
     unit?: Unit;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedShoppingListEntry
      */
-    amount?: string;
+    amount?: number;
     /**
      * 
      * @type {number}
@@ -163,6 +163,7 @@ export function PatchedShoppingListEntryToJSON(value?: PatchedShoppingListEntry
     }
     return {
         
+        'id': value['id'],
         'list_recipe': value['listRecipe'],
         'food': FoodToJSON(value['food']),
         'unit': UnitToJSON(value['unit']),

vue3/src/openapi/models/PatchedShoppingListRecipe.ts

@@ -24,7 +24,7 @@ export interface PatchedShoppingListRecipe {
      * @type {number}
      * @memberof PatchedShoppingListRecipe
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -51,10 +51,10 @@ export interface PatchedShoppingListRecipe {
     mealplan?: number;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedShoppingListRecipe
      */
-    servings?: string;
+    servings?: number;
     /**
      * 
      * @type {string}
@@ -110,6 +110,7 @@ export function PatchedShoppingListRecipeToJSON(value?: PatchedShoppingListRecip
     }
     return {
         
+        'id': value['id'],
         'recipe': value['recipe'],
         'mealplan': value['mealplan'],
         'servings': value['servings'],

vue3/src/openapi/models/PatchedSpace.ts

@@ -49,7 +49,7 @@ export interface PatchedSpace {
      * @type {number}
      * @memberof PatchedSpace
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -112,22 +112,22 @@ export interface PatchedSpace {
     foodInherit?: Array<FoodInheritField>;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedSpace
      */
-    readonly userCount?: string;
+    readonly userCount?: number;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedSpace
      */
-    readonly recipeCount?: string;
+    readonly recipeCount?: number;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedSpace
      */
-    readonly fileSizeMb?: string;
+    readonly fileSizeMb?: number;
     /**
      * 
      * @type {UserFileView}
@@ -261,6 +261,7 @@ export function PatchedSpaceToJSON(value?: PatchedSpace | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'message': value['message'],
         'food_inherit': value['foodInherit'] == null ? undefined : ((value['foodInherit'] as Array<any>).map(FoodInheritFieldToJSON)),

vue3/src/openapi/models/PatchedStep.ts

@@ -37,7 +37,7 @@ export interface PatchedStep {
      * @type {number}
      * @memberof PatchedStep
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -94,16 +94,16 @@ export interface PatchedStep {
     stepRecipe?: number;
     /**
      * 
-     * @type {string}
+     * @type {any}
      * @memberof PatchedStep
      */
-    readonly stepRecipeData?: string;
+    readonly stepRecipeData?: any;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedStep
      */
-    readonly numrecipe?: string;
+    readonly numrecipe?: number;
     /**
      * 
      * @type {boolean}
@@ -151,6 +151,7 @@ export function PatchedStepToJSON(value?: PatchedStep | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'instruction': value['instruction'],
         'ingredients': value['ingredients'] == null ? undefined : ((value['ingredients'] as Array<any>).map(IngredientToJSON)),

vue3/src/openapi/models/PatchedStorage.ts

@@ -31,7 +31,7 @@ export interface PatchedStorage {
      * @type {number}
      * @memberof PatchedStorage
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -103,6 +103,7 @@ export function PatchedStorageToJSON(value?: PatchedStorage | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'method': MethodEnumToJSON(value['method']),
         'username': value['username'],

vue3/src/openapi/models/PatchedSupermarket.ts

@@ -65,7 +65,7 @@ export interface PatchedSupermarket {
      * @type {number}
      * @memberof PatchedSupermarket
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -123,6 +123,7 @@ export function PatchedSupermarketToJSON(value?: PatchedSupermarket | null): any
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
         'open_data_slug': value['openDataSlug'],

vue3/src/openapi/models/PatchedSupermarketCategory.ts

@@ -58,7 +58,7 @@ export interface PatchedSupermarketCategory {
      * @type {number}
      * @memberof PatchedSupermarketCategory
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -102,6 +102,7 @@ export function PatchedSupermarketCategoryToJSON(value?: PatchedSupermarketCateg
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
     };

vue3/src/openapi/models/PatchedSupermarketCategoryRelation.ts

@@ -31,7 +31,7 @@ export interface PatchedSupermarketCategoryRelation {
      * @type {number}
      * @memberof PatchedSupermarketCategoryRelation
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {SupermarketCategory}
@@ -82,6 +82,7 @@ export function PatchedSupermarketCategoryRelationToJSON(value?: PatchedSupermar
     }
     return {
         
+        'id': value['id'],
         'category': SupermarketCategoryToJSON(value['category']),
         'supermarket': value['supermarket'],
         'order': value['order'],

vue3/src/openapi/models/PatchedSync.ts

@@ -24,7 +24,7 @@ export interface PatchedSync {
      * @type {number}
      * @memberof PatchedSync
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -96,6 +96,7 @@ export function PatchedSyncToJSON(value?: PatchedSync | null): any {
     }
     return {
         
+        'id': value['id'],
         'storage': value['storage'],
         'path': value['path'],
         'active': value['active'],

vue3/src/openapi/models/PatchedUnit.ts

@@ -58,7 +58,7 @@ export interface PatchedUnit {
      * @type {number}
      * @memberof PatchedUnit
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -123,6 +123,7 @@ export function PatchedUnitToJSON(value?: PatchedUnit | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'plural_name': value['pluralName'],
         'description': value['description'],

vue3/src/openapi/models/PatchedUnitConversion.ts

@@ -37,7 +37,7 @@ export interface PatchedUnitConversion {
      * @type {number}
      * @memberof PatchedUnitConversion
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -46,10 +46,10 @@ export interface PatchedUnitConversion {
     readonly name?: string;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedUnitConversion
      */
-    baseAmount?: string;
+    baseAmount?: number;
     /**
      * 
      * @type {Unit}
@@ -58,10 +58,10 @@ export interface PatchedUnitConversion {
     baseUnit?: Unit;
     /**
      * 
-     * @type {string}
+     * @type {number}
      * @memberof PatchedUnitConversion
      */
-    convertedAmount?: string;
+    convertedAmount?: number;
     /**
      * 
      * @type {Unit}
@@ -116,6 +116,7 @@ export function PatchedUnitConversionToJSON(value?: PatchedUnitConversion | null
     }
     return {
         
+        'id': value['id'],
         'base_amount': value['baseAmount'],
         'base_unit': UnitToJSON(value['baseUnit']),
         'converted_amount': value['convertedAmount'],

vue3/src/openapi/models/PatchedUser.ts

@@ -24,7 +24,7 @@ export interface PatchedUser {
      * @type {number}
      * @memberof PatchedUser
      */
-    readonly id?: number;
+    id?: number;
     /**
      * Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.
      * @type {string}
@@ -82,6 +82,7 @@ export function PatchedUserToJSON(value?: PatchedUser | null): any {
     }
     return {
         
+        'id': value['id'],
         'first_name': value['firstName'],
         'last_name': value['lastName'],
     };

vue3/src/openapi/models/PatchedUserPreference.ts

@@ -19,6 +19,12 @@ import {
     DefaultPageEnumFromJSONTyped,
     DefaultPageEnumToJSON,
 } from './DefaultPageEnum';
+import type { FoodInheritField } from './FoodInheritField';
+import {
+    FoodInheritFieldFromJSON,
+    FoodInheritFieldFromJSONTyped,
+    FoodInheritFieldToJSON,
+} from './FoodInheritField';
 import type { ThemeEnum } from './ThemeEnum';
 import {
     ThemeEnumFromJSON,
@@ -148,10 +154,10 @@ export interface PatchedUserPreference {
     mealplanAutoaddShopping?: boolean;
     /**
      * 
-     * @type {string}
+     * @type {FoodInheritField}
      * @memberof PatchedUserPreference
      */
-    readonly foodInheritDefault?: string;
+    readonly foodInheritDefault?: FoodInheritField;
     /**
      * 
      * @type {number}
@@ -220,10 +226,10 @@ export interface PatchedUserPreference {
     showStepIngredients?: boolean;
     /**
      * 
-     * @type {string}
+     * @type {boolean}
      * @memberof PatchedUserPreference
      */
-    readonly foodChildrenExist?: string;
+    readonly foodChildrenExist?: boolean;
 }
 
 /**
@@ -259,7 +265,7 @@ export function PatchedUserPreferenceFromJSONTyped(json: any, ignoreDiscriminato
         'comments': json['comments'] == null ? undefined : json['comments'],
         'shoppingAutoSync': json['shopping_auto_sync'] == null ? undefined : json['shopping_auto_sync'],
         'mealplanAutoaddShopping': json['mealplan_autoadd_shopping'] == null ? undefined : json['mealplan_autoadd_shopping'],
-        'foodInheritDefault': json['food_inherit_default'] == null ? undefined : json['food_inherit_default'],
+        'foodInheritDefault': json['food_inherit_default'] == null ? undefined : FoodInheritFieldFromJSON(json['food_inherit_default']),
         'defaultDelay': json['default_delay'] == null ? undefined : json['default_delay'],
         'mealplanAutoincludeRelated': json['mealplan_autoinclude_related'] == null ? undefined : json['mealplan_autoinclude_related'],
         'mealplanAutoexcludeOnhand': json['mealplan_autoexclude_onhand'] == null ? undefined : json['mealplan_autoexclude_onhand'],

vue3/src/openapi/models/PatchedUserSpace.ts

@@ -37,7 +37,7 @@ export interface PatchedUserSpace {
      * @type {number}
      * @memberof PatchedUserSpace
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {User}
@@ -123,6 +123,7 @@ export function PatchedUserSpaceToJSON(value?: PatchedUserSpace | null): any {
     }
     return {
         
+        'id': value['id'],
         'groups': value['groups'] == null ? undefined : ((value['groups'] as Array<any>).map(GroupToJSON)),
         'active': value['active'],
         'internal_note': value['internalNote'],

vue3/src/openapi/models/PatchedViewLog.ts

@@ -24,7 +24,7 @@ export interface PatchedViewLog {
      * @type {number}
      * @memberof PatchedViewLog
      */
-    readonly id?: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -75,6 +75,7 @@ export function PatchedViewLogToJSON(value?: PatchedViewLog | null): any {
     }
     return {
         
+        'id': value['id'],
         'recipe': value['recipe'],
     };
 }

vue3/src/openapi/models/Property.ts

@@ -65,7 +65,7 @@ export interface Property {
      * @type {number}
      * @memberof Property
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -84,7 +84,6 @@ export interface Property {
  * Check if a given object implements the Property interface.
  */
 export function instanceOfProperty(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('propertyAmount' in value)) return false;
     if (!('propertyType' in value)) return false;
     return true;
@@ -100,7 +99,7 @@ export function PropertyFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'propertyAmount': json['property_amount'],
         'propertyType': PropertyTypeFromJSON(json['property_type']),
     };
@@ -112,6 +111,7 @@ export function PropertyToJSON(value?: Property | null): any {
     }
     return {
         
+        'id': value['id'],
         'property_amount': value['propertyAmount'],
         'property_type': PropertyTypeToJSON(value['propertyType']),
     };

vue3/src/openapi/models/PropertyType.ts

@@ -24,7 +24,7 @@ export interface PropertyType {
      * @type {number}
      * @memberof PropertyType
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -67,7 +67,6 @@ export interface PropertyType {
  * Check if a given object implements the PropertyType interface.
  */
 export function instanceOfPropertyType(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     return true;
 }
@@ -82,7 +81,7 @@ export function PropertyTypeFromJSONTyped(json: any, ignoreDiscriminator: boolea
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'unit': json['unit'] == null ? undefined : json['unit'],
         'description': json['description'] == null ? undefined : json['description'],
@@ -98,6 +97,7 @@ export function PropertyTypeToJSON(value?: PropertyType | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'unit': value['unit'],
         'description': value['description'],

vue3/src/openapi/models/Recipe.ts

@@ -55,7 +55,7 @@ export interface Recipe {
      * @type {number}
      * @memberof Recipe
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -200,7 +200,6 @@ export interface Recipe {
  * Check if a given object implements the Recipe interface.
  */
 export function instanceOfRecipe(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('image' in value)) return false;
     if (!('steps' in value)) return false;
@@ -223,7 +222,7 @@ export function RecipeFromJSONTyped(json: any, ignoreDiscriminator: boolean): Re
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'description': json['description'] == null ? undefined : json['description'],
         'image': json['image'],
@@ -256,6 +255,7 @@ export function RecipeToJSON(value?: Recipe | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
         'keywords': value['keywords'] == null ? undefined : ((value['keywords'] as Array<any>).map(KeywordToJSON)),

vue3/src/openapi/models/RecipeBook.ts

@@ -37,7 +37,7 @@ export interface RecipeBook {
      * @type {number}
      * @memberof RecipeBook
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -80,7 +80,6 @@ export interface RecipeBook {
  * Check if a given object implements the RecipeBook interface.
  */
 export function instanceOfRecipeBook(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('shared' in value)) return false;
     if (!('createdBy' in value)) return false;
@@ -97,7 +96,7 @@ export function RecipeBookFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'description': json['description'] == null ? undefined : json['description'],
         'shared': ((json['shared'] as Array<any>).map(UserFromJSON)),
@@ -113,6 +112,7 @@ export function RecipeBookToJSON(value?: RecipeBook | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
         'shared': ((value['shared'] as Array<any>).map(UserToJSON)),

vue3/src/openapi/models/RecipeBookEntry.ts

@@ -37,7 +37,7 @@ export interface RecipeBookEntry {
      * @type {number}
      * @memberof RecipeBookEntry
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -68,7 +68,6 @@ export interface RecipeBookEntry {
  * Check if a given object implements the RecipeBookEntry interface.
  */
 export function instanceOfRecipeBookEntry(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('book' in value)) return false;
     if (!('bookContent' in value)) return false;
     if (!('recipe' in value)) return false;
@@ -86,7 +85,7 @@ export function RecipeBookEntryFromJSONTyped(json: any, ignoreDiscriminator: boo
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'book': json['book'],
         'bookContent': RecipeBookFromJSON(json['book_content']),
         'recipe': json['recipe'],
@@ -100,6 +99,7 @@ export function RecipeBookEntryToJSON(value?: RecipeBookEntry | null): any {
     }
     return {
         
+        'id': value['id'],
         'book': value['book'],
         'recipe': value['recipe'],
     };

vue3/src/openapi/models/RecipeFlat.ts

@@ -24,7 +24,7 @@ export interface RecipeFlat {
      * @type {number}
      * @memberof RecipeFlat
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -43,7 +43,6 @@ export interface RecipeFlat {
  * Check if a given object implements the RecipeFlat interface.
  */
 export function instanceOfRecipeFlat(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     return true;
 }
@@ -58,7 +57,7 @@ export function RecipeFlatFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'image': json['image'] == null ? undefined : json['image'],
     };
@@ -70,6 +69,7 @@ export function RecipeFlatToJSON(value?: RecipeFlat | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'image': value['image'],
     };

vue3/src/openapi/models/RecipeOverview.ts

@@ -31,7 +31,7 @@ export interface RecipeOverview {
      * @type {number}
      * @memberof RecipeOverview
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -134,7 +134,6 @@ export interface RecipeOverview {
  * Check if a given object implements the RecipeOverview interface.
  */
 export function instanceOfRecipeOverview(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('image' in value)) return false;
     if (!('keywords' in value)) return false;
@@ -163,7 +162,7 @@ export function RecipeOverviewFromJSONTyped(json: any, ignoreDiscriminator: bool
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'description': json['description'] == null ? undefined : json['description'],
         'image': json['image'],
@@ -189,6 +188,7 @@ export function RecipeOverviewToJSON(value?: RecipeOverview | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
     };

vue3/src/openapi/models/RecipeShoppingUpdate.ts

@@ -24,14 +24,31 @@ export interface RecipeShoppingUpdate {
      * @type {number}
      * @memberof RecipeShoppingUpdate
      */
-    readonly id: number;
+    id?: number;
+    /**
+     * Existing shopping list to update
+     * @type {number}
+     * @memberof RecipeShoppingUpdate
+     */
+    listRecipe?: number;
+    /**
+     * List of ingredient IDs from the recipe to add, if not provided all ingredients will be added.
+     * @type {number}
+     * @memberof RecipeShoppingUpdate
+     */
+    ingredients?: number;
+    /**
+     * Providing a list_recipe ID and servings of 0 will delete that shopping list.
+     * @type {number}
+     * @memberof RecipeShoppingUpdate
+     */
+    servings?: number;
 }
 
 /**
  * Check if a given object implements the RecipeShoppingUpdate interface.
  */
 export function instanceOfRecipeShoppingUpdate(value: object): boolean {
-    if (!('id' in value)) return false;
     return true;
 }
 
@@ -45,7 +62,10 @@ export function RecipeShoppingUpdateFromJSONTyped(json: any, ignoreDiscriminator
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
+        'listRecipe': json['list_recipe'] == null ? undefined : json['list_recipe'],
+        'ingredients': json['ingredients'] == null ? undefined : json['ingredients'],
+        'servings': json['servings'] == null ? undefined : json['servings'],
     };
 }
 
@@ -55,6 +75,10 @@ export function RecipeShoppingUpdateToJSON(value?: RecipeShoppingUpdate | null):
     }
     return {
         
+        'id': value['id'],
+        'list_recipe': value['listRecipe'],
+        'ingredients': value['ingredients'],
+        'servings': value['servings'],
     };
 }
 

vue3/src/openapi/models/RecipeSimple.ts

@@ -24,7 +24,7 @@ export interface RecipeSimple {
      * @type {number}
      * @memberof RecipeSimple
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -43,7 +43,6 @@ export interface RecipeSimple {
  * Check if a given object implements the RecipeSimple interface.
  */
 export function instanceOfRecipeSimple(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('url' in value)) return false;
     return true;
@@ -59,7 +58,7 @@ export function RecipeSimpleFromJSONTyped(json: any, ignoreDiscriminator: boolea
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'url': json['url'],
     };
@@ -71,6 +70,7 @@ export function RecipeSimpleToJSON(value?: RecipeSimple | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
     };
 }

vue3/src/openapi/models/ShoppingListEntry.ts

@@ -49,7 +49,7 @@ export interface ShoppingListEntry {
      * @type {number}
      * @memberof ShoppingListEntry
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -128,7 +128,6 @@ export interface ShoppingListEntry {
  * Check if a given object implements the ShoppingListEntry interface.
  */
 export function instanceOfShoppingListEntry(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('food' in value)) return false;
     if (!('amount' in value)) return false;
     if (!('recipeMealplan' in value)) return false;
@@ -148,7 +147,7 @@ export function ShoppingListEntryFromJSONTyped(json: any, ignoreDiscriminator: b
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'listRecipe': json['list_recipe'] == null ? undefined : json['list_recipe'],
         'food': FoodFromJSON(json['food']),
         'unit': json['unit'] == null ? undefined : UnitFromJSON(json['unit']),
@@ -170,6 +169,7 @@ export function ShoppingListEntryToJSON(value?: ShoppingListEntry | null): any {
     }
     return {
         
+        'id': value['id'],
         'list_recipe': value['listRecipe'],
         'food': FoodToJSON(value['food']),
         'unit': UnitToJSON(value['unit']),

vue3/src/openapi/models/ShoppingListRecipe.ts

@@ -24,7 +24,7 @@ export interface ShoppingListRecipe {
      * @type {number}
      * @memberof ShoppingListRecipe
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -79,7 +79,6 @@ export interface ShoppingListRecipe {
  * Check if a given object implements the ShoppingListRecipe interface.
  */
 export function instanceOfShoppingListRecipe(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('recipeName' in value)) return false;
     if (!('name' in value)) return false;
     if (!('servings' in value)) return false;
@@ -99,7 +98,7 @@ export function ShoppingListRecipeFromJSONTyped(json: any, ignoreDiscriminator:
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'recipeName': json['recipe_name'],
         'name': json['name'],
         'recipe': json['recipe'] == null ? undefined : json['recipe'],
@@ -117,6 +116,7 @@ export function ShoppingListRecipeToJSON(value?: ShoppingListRecipe | null): any
     }
     return {
         
+        'id': value['id'],
         'recipe': value['recipe'],
         'mealplan': value['mealplan'],
         'servings': value['servings'],

vue3/src/openapi/models/Space.ts

@@ -49,7 +49,7 @@ export interface Space {
      * @type {number}
      * @memberof Space
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -212,7 +212,6 @@ export interface Space {
  * Check if a given object implements the Space interface.
  */
 export function instanceOfSpace(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('createdBy' in value)) return false;
     if (!('createdAt' in value)) return false;
     if (!('maxRecipes' in value)) return false;
@@ -237,7 +236,7 @@ export function SpaceFromJSONTyped(json: any, ignoreDiscriminator: boolean): Spa
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'] == null ? undefined : json['name'],
         'createdBy': json['created_by'],
         'createdAt': (new Date(json['created_at'])),
@@ -273,6 +272,7 @@ export function SpaceToJSON(value?: Space | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'message': value['message'],
         'food_inherit': ((value['foodInherit'] as Array<any>).map(FoodInheritFieldToJSON)),

vue3/src/openapi/models/Step.ts

@@ -37,7 +37,7 @@ export interface Step {
      * @type {number}
      * @memberof Step
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -116,7 +116,6 @@ export interface Step {
  * Check if a given object implements the Step interface.
  */
 export function instanceOfStep(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('ingredients' in value)) return false;
     if (!('instructionsMarkdown' in value)) return false;
     if (!('stepRecipeData' in value)) return false;
@@ -134,7 +133,7 @@ export function StepFromJSONTyped(json: any, ignoreDiscriminator: boolean): Step
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'] == null ? undefined : json['name'],
         'instruction': json['instruction'] == null ? undefined : json['instruction'],
         'ingredients': ((json['ingredients'] as Array<any>).map(IngredientFromJSON)),
@@ -156,6 +155,7 @@ export function StepToJSON(value?: Step | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'instruction': value['instruction'],
         'ingredients': ((value['ingredients'] as Array<any>).map(IngredientToJSON)),

vue3/src/openapi/models/Storage.ts

@@ -31,7 +31,7 @@ export interface Storage {
      * @type {number}
      * @memberof Storage
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -50,6 +50,18 @@ export interface Storage {
      * @memberof Storage
      */
     username?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof Storage
+     */
+    password?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof Storage
+     */
+    token?: string;
     /**
      * 
      * @type {number}
@@ -62,7 +74,6 @@ export interface Storage {
  * Check if a given object implements the Storage interface.
  */
 export function instanceOfStorage(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('createdBy' in value)) return false;
     return true;
@@ -78,10 +89,12 @@ export function StorageFromJSONTyped(json: any, ignoreDiscriminator: boolean): S
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'method': json['method'] == null ? undefined : MethodEnumFromJSON(json['method']),
         'username': json['username'] == null ? undefined : json['username'],
+        'password': json['password'] == null ? undefined : json['password'],
+        'token': json['token'] == null ? undefined : json['token'],
         'createdBy': json['created_by'],
     };
 }
@@ -92,9 +105,12 @@ export function StorageToJSON(value?: Storage | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'method': MethodEnumToJSON(value['method']),
         'username': value['username'],
+        'password': value['password'],
+        'token': value['token'],
     };
 }
 

vue3/src/openapi/models/Supermarket.ts

@@ -65,7 +65,7 @@ export interface Supermarket {
      * @type {number}
      * @memberof Supermarket
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -96,7 +96,6 @@ export interface Supermarket {
  * Check if a given object implements the Supermarket interface.
  */
 export function instanceOfSupermarket(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     if (!('categoryToSupermarket' in value)) return false;
     return true;
@@ -112,7 +111,7 @@ export function SupermarketFromJSONTyped(json: any, ignoreDiscriminator: boolean
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'description': json['description'] == null ? undefined : json['description'],
         'categoryToSupermarket': ((json['category_to_supermarket'] as Array<any>).map(SupermarketCategoryRelationFromJSON)),
@@ -126,6 +125,7 @@ export function SupermarketToJSON(value?: Supermarket | null): any {
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
         'open_data_slug': value['openDataSlug'],

vue3/src/openapi/models/SupermarketCategory.ts

@@ -58,7 +58,7 @@ export interface SupermarketCategory {
      * @type {number}
      * @memberof SupermarketCategory
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {string}
@@ -77,7 +77,6 @@ export interface SupermarketCategory {
  * Check if a given object implements the SupermarketCategory interface.
  */
 export function instanceOfSupermarketCategory(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('name' in value)) return false;
     return true;
 }
@@ -92,7 +91,7 @@ export function SupermarketCategoryFromJSONTyped(json: any, ignoreDiscriminator:
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'name': json['name'],
         'description': json['description'] == null ? undefined : json['description'],
     };
@@ -104,6 +103,7 @@ export function SupermarketCategoryToJSON(value?: SupermarketCategory | null): a
     }
     return {
         
+        'id': value['id'],
         'name': value['name'],
         'description': value['description'],
     };

vue3/src/openapi/models/SupermarketCategoryRelation.ts

@@ -31,7 +31,7 @@ export interface SupermarketCategoryRelation {
      * @type {number}
      * @memberof SupermarketCategoryRelation
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {SupermarketCategory}
@@ -56,7 +56,6 @@ export interface SupermarketCategoryRelation {
  * Check if a given object implements the SupermarketCategoryRelation interface.
  */
 export function instanceOfSupermarketCategoryRelation(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('category' in value)) return false;
     if (!('supermarket' in value)) return false;
     return true;
@@ -72,7 +71,7 @@ export function SupermarketCategoryRelationFromJSONTyped(json: any, ignoreDiscri
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'category': SupermarketCategoryFromJSON(json['category']),
         'supermarket': json['supermarket'],
         'order': json['order'] == null ? undefined : json['order'],
@@ -85,6 +84,7 @@ export function SupermarketCategoryRelationToJSON(value?: SupermarketCategoryRel
     }
     return {
         
+        'id': value['id'],
         'category': SupermarketCategoryToJSON(value['category']),
         'supermarket': value['supermarket'],
         'order': value['order'],

vue3/src/openapi/models/Sync.ts

@@ -24,7 +24,7 @@ export interface Sync {
      * @type {number}
      * @memberof Sync
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -67,7 +67,6 @@ export interface Sync {
  * Check if a given object implements the Sync interface.
  */
 export function instanceOfSync(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('storage' in value)) return false;
     if (!('createdAt' in value)) return false;
     if (!('updatedAt' in value)) return false;
@@ -84,7 +83,7 @@ export function SyncFromJSONTyped(json: any, ignoreDiscriminator: boolean): Sync
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'storage': json['storage'],
         'path': json['path'] == null ? undefined : json['path'],
         'active': json['active'] == null ? undefined : json['active'],
@@ -100,6 +99,7 @@ export function SyncToJSON(value?: Sync | null): any {
     }
     return {
         
+        'id': value['id'],
         'storage': value['storage'],
         'path': value['path'],
         'active': value['active'],

vue3/src/openapi/models/SyncLog.ts

@@ -24,7 +24,7 @@ export interface SyncLog {
      * @type {number}
      * @memberof SyncLog
      */
-    readonly id: number;
+    id?: number;
     /**
      * 
      * @type {number}
@@ -55,7 +55,6 @@ export interface SyncLog {
  * Check if a given object implements the SyncLog interface.
  */
 export function instanceOfSyncLog(value: object): boolean {
-    if (!('id' in value)) return false;
     if (!('sync' in value)) return false;
     if (!('status' in value)) return false;
     if (!('createdAt' in value)) return false;
@@ -72,7 +71,7 @@ export function SyncLogFromJSONTyped(json: any, ignoreDiscriminator: boolean): S
     }
     return {
         
-        'id': json['id'],
+        'id': json['id'] == null ? undefined : json['id'],
         'sync': json['sync'],
         'status': json['status'],
         'msg': json['msg'] == null ? undefined : json['msg'],
@@ -86,6 +85,7 @@ export function SyncLogToJSON(value?: SyncLog | null): any {
     }
     return {
         
+        'id': value['id'],
         'sync': value['sync'],
         'status': value['status'],
         'msg': value['msg'],