refactor/consistent model names

mealie/db/models/_all_models.py

@@ -1,5 +1,5 @@
-from db.models.meal_models import *
-from db.models.recipe_models import *
-from db.models.settings_models import *
-from db.models.theme_models import *
+from db.models.mealplan import *
+from db.models.recipe import *
+from db.models.settings import *
+from db.models.theme import *
 from db.models.users import *

mealie/db/models/settings.py

@@ -1,7 +1,6 @@
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
 from db.models.model_base import BaseMixins, SqlAlchemyBase
-from db.models.recipe_models import Category
 
 
 class SiteSettingsModel(SqlAlchemyBase, BaseMixins):

mealie/tests/test_routes/test_user_routes.py

@@ -84,13 +84,7 @@ def test_update_user(api_client: requests, token):
     response = api_client.put(f"{BASE}/1", headers=token, json=update_data)
 
     assert response.status_code == 200
-    assert json.loads(response.text) == {
-        "id": 1,
-        "fullName": "Updated Name",
-        "email": "updated@email.com",
-        "family": "public",
-        "admin": True
-    }
+    assert json.loads(response.text).get("access_token")
 
 
 def test_delete_user(api_client: requests, token):