Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-01-21 00:11:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: database unique constraints (#2594)

Browse Source 
* fixed missing migration name

* added unique constraints to all m2m tables

* fixed bug trying to create duplicate tags

* added more unique constraints

* fixed duplicate seeder data

* updated tests

* fixed seed rollback error
This commit is contained in:
Michael Genson
2023-10-07 14:23:13 -05:00
committed by GitHub
parent 247a4de283
commit a98e863bca
13 changed files with 222 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mealie/repos/repository_generic.py
View File

@@ -164,10 +164,15 @@ class RepositoryGeneric(Generic[Schema, Model]):
return eff_schema.from_orm(result)
def create(self, data: Schema | BaseModel | dict) -> Schema:
data = data if isinstance(data, dict) else data.dict()
new_document = self.model(session=self.session, **data)
self.session.add(new_document)
self.session.commit()
try:
data = data if isinstance(data, dict) else data.dict()
new_document = self.model(session=self.session, **data)
self.session.add(new_document)
self.session.commit()
except Exception:
self.session.rollback()
raise
self.session.refresh(new_document)
return self.schema.from_orm(new_document)

17
mealie/repos/seed/seeders.py
View File

@@ -4,10 +4,7 @@ from collections.abc import Generator
from functools import cached_property
from mealie.schema.labels import MultiPurposeLabelSave
from mealie.schema.recipe.recipe_ingredient import (
SaveIngredientFood,
SaveIngredientUnit,
)
from mealie.schema.recipe.recipe_ingredient import SaveIngredientFood, SaveIngredientUnit
from mealie.services.group_services.labels_service import MultiPurposeLabelService
from ._abstract_seeder import AbstractSeeder
@@ -26,7 +23,12 @@ class MultiPurposeLabelSeeder(AbstractSeeder):
def load_data(self, locale: str | None = None) -> Generator[MultiPurposeLabelSave, None, None]:
file = self.get_file(locale)
seen_label_names = set()
for label in json.loads(file.read_text(encoding="utf-8")):
if label["name"] in seen_label_names:
continue
seen_label_names.add(label["name"])
yield MultiPurposeLabelSave(
name=label["name"],
group_id=self.group_id,
@@ -49,7 +51,12 @@ class IngredientUnitsSeeder(AbstractSeeder):
def load_data(self, locale: str | None = None) -> Generator[SaveIngredientUnit, None, None]:
file = self.get_file(locale)
seen_unit_names = set()
for unit in json.loads(file.read_text(encoding="utf-8")).values():
if unit["name"] in seen_unit_names:
continue
seen_unit_names.add(unit["name"])
yield SaveIngredientUnit(
group_id=self.group_id,
name=unit["name"],
@@ -75,7 +82,7 @@ class IngredientFoodsSeeder(AbstractSeeder):
file = self.get_file(locale)
seed_foods: dict[str, str] = json.loads(file.read_text(encoding="utf-8"))
for food in seed_foods.values():
for food in set(seed_foods.values()):
yield SaveIngredientFood(
group_id=self.group_id,
name=food,