From 60b4c73e31e4e520712ce41c9c604394e7c899f0 Mon Sep 17 00:00:00 2001
From: hay-kot <hay-kot@pm.me>
Date: Tue, 23 Feb 2021 15:04:02 -0900
Subject: [PATCH] refactor/consistent model names

---
 mealie/db/models/_all_models.py                      | 8 ++++----
 mealie/db/models/{meal_models.py => mealplan.py}     | 0
 mealie/db/models/{recipe_models.py => recipe.py}     | 0
 mealie/db/models/{settings_models.py => settings.py} | 1 -
 mealie/db/models/{theme_models.py => theme.py}       | 0
 mealie/tests/test_routes/test_user_routes.py         | 8 +-------
 6 files changed, 5 insertions(+), 12 deletions(-)
 rename mealie/db/models/{meal_models.py => mealplan.py} (100%)
 rename mealie/db/models/{recipe_models.py => recipe.py} (100%)
 rename mealie/db/models/{settings_models.py => settings.py} (98%)
 rename mealie/db/models/{theme_models.py => theme.py} (100%)

diff --git a/mealie/db/models/_all_models.py b/mealie/db/models/_all_models.py
index a3f679168..e0deb2401 100644
--- a/mealie/db/models/_all_models.py
+++ b/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 *
diff --git a/mealie/db/models/meal_models.py b/mealie/db/models/mealplan.py
similarity index 100%
rename from mealie/db/models/meal_models.py
rename to mealie/db/models/mealplan.py
diff --git a/mealie/db/models/recipe_models.py b/mealie/db/models/recipe.py
similarity index 100%
rename from mealie/db/models/recipe_models.py
rename to mealie/db/models/recipe.py
diff --git a/mealie/db/models/settings_models.py b/mealie/db/models/settings.py
similarity index 98%
rename from mealie/db/models/settings_models.py
rename to mealie/db/models/settings.py
index ee589a8cb..1ba470bd5 100644
--- a/mealie/db/models/settings_models.py
+++ b/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):
diff --git a/mealie/db/models/theme_models.py b/mealie/db/models/theme.py
similarity index 100%
rename from mealie/db/models/theme_models.py
rename to mealie/db/models/theme.py
diff --git a/mealie/tests/test_routes/test_user_routes.py b/mealie/tests/test_routes/test_user_routes.py
index 3016cc7f5..02a542d0e 100644
--- a/mealie/tests/test_routes/test_user_routes.py
+++ b/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):