Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-12-23 18:55:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(backend): ♻️ rename UserInDb -> PrivateUser

Browse Source
This commit is contained in:
hay-kot
2021-08-28 17:31:05 -08:00
parent df002c383c
commit 4a7f8428c5
24 changed files with 151 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mealie/db/data_access_layer/db_access.py
View File

@@ -27,7 +27,7 @@ from mealie.schema.recipe import (
RecipeCategoryResponse,
RecipeTagResponse,
)
from mealie.schema.user import GroupInDB, LongLiveTokenInDB, SignUpOut, UserInDB
from mealie.schema.user import GroupInDB, LongLiveTokenInDB, SignUpOut, PrivateUser
from ._base_access_model import BaseAccessModel
from .recipe_access_model import RecipeDataAccessModel
@@ -78,7 +78,7 @@ class DatabaseAccessLayer:
self.events = BaseAccessModel(DEFAULT_PK, Event, EventSchema)
# Users / Groups
self.users = UserDataAccessModel(DEFAULT_PK, User, UserInDB)
self.users = UserDataAccessModel(DEFAULT_PK, User, PrivateUser)
self.api_tokens = BaseAccessModel(DEFAULT_PK, LongLiveToken, LongLiveTokenInDB)
self.groups = GroupDataAccessModel(DEFAULT_PK, Group, GroupInDB)
self.meals = BaseAccessModel(DEFAULT_PK, MealPlan, MealPlanOut)

4
mealie/db/data_access_layer/user_access_model.py
View File

@@ -1,10 +1,10 @@
from mealie.db.models.users import User
from mealie.schema.user.user import UserInDB
from mealie.schema.user.user import PrivateUser
from ._base_access_model import BaseAccessModel
class UserDataAccessModel(BaseAccessModel[UserInDB, User]):
class UserDataAccessModel(BaseAccessModel[PrivateUser, User]):
def update_password(self, session, id, password: str):
entry = self._query_one(session=session, match_value=id)
entry.update_password(password)

4
mealie/db/init_db.py
View File

@@ -2,7 +2,7 @@ from sqlalchemy.orm import Session
from mealie.core import root_logger
from mealie.core.config import settings
from mealie.core.security import get_password_hash
from mealie.core.security import hash_password
from mealie.db.data_initialization.init_units_foods import default_recipe_unit_init
from mealie.db.database import db
from mealie.db.db_setup import create_session, engine
@@ -48,7 +48,7 @@ def default_user_init(session: Session):
"full_name": "Change Me",
"username": "admin",
"email": settings.DEFAULT_EMAIL,
"password": get_password_hash(settings.DEFAULT_PASSWORD),
"password": hash_password(settings.DEFAULT_PASSWORD),
"group": settings.DEFAULT_GROUP,
"admin": True,
}