mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-08-05 21:45:25 +02:00
feat: ✨ add user recipe export functionality (#845)
* feat(frontend): ✨ add user recipe export functionality * remove depreciated folders * change/remove depreciated folders * add testing variable in config * add GUID support for group_id * improve testing feedback on 422 errors * remove/cleanup files/folders * initial user export support * delete unused css * update backup page UI * remove depreciated settings * feat: ✨ export download links * fix #813 * remove top level statements * show footer * add export purger to scheduler * update purge glob * fix meal-planner lockout * feat: ✨ add bulk delete/purge exports * style(frontend): 💄 update UI for site settings * feat: ✨ add version checker * update documentation Co-authored-by: hay-kot <hay-kot@pm.me>
This commit is contained in:
parent
2ce195a0d4
commit
c32d7d7486
84 changed files with 1329 additions and 667 deletions
2
tests/fixtures/fixture_admin.py
vendored
2
tests/fixtures/fixture_admin.py
vendored
|
@ -31,7 +31,7 @@ def admin_user(api_client: TestClient, api_routes: utils.AppRoutes):
|
|||
|
||||
try:
|
||||
yield utils.TestUser(
|
||||
group_id=user_data.get("groupId"),
|
||||
_group_id=user_data.get("groupId"),
|
||||
user_id=user_data.get("id"),
|
||||
email=user_data.get("email"),
|
||||
token=token,
|
||||
|
|
4
tests/fixtures/fixture_users.py
vendored
4
tests/fixtures/fixture_users.py
vendored
|
@ -38,7 +38,7 @@ def g2_user(admin_token, api_client: requests, api_routes: utils.AppRoutes):
|
|||
group_id = json.loads(self_response.text).get("groupId")
|
||||
|
||||
try:
|
||||
yield utils.TestUser(user_id=user_id, group_id=group_id, token=token, email=create_data["email"])
|
||||
yield utils.TestUser(user_id=user_id, _group_id=group_id, token=token, email=create_data["email"])
|
||||
finally:
|
||||
# TODO: Delete User after test
|
||||
pass
|
||||
|
@ -59,7 +59,7 @@ def unique_user(api_client: TestClient, api_routes: utils.AppRoutes):
|
|||
|
||||
try:
|
||||
yield utils.TestUser(
|
||||
group_id=user_data.get("groupId"),
|
||||
_group_id=user_data.get("groupId"),
|
||||
user_id=user_data.get("id"),
|
||||
email=user_data.get("email"),
|
||||
token=token,
|
||||
|
|
|
@ -16,21 +16,21 @@ class Routes:
|
|||
|
||||
|
||||
def test_home_group_not_deletable(api_client: TestClient, admin_user: TestUser):
|
||||
response = api_client.delete(Routes.item(1), headers=admin_user.token)
|
||||
response = api_client.delete(Routes.item(admin_user.group_id), headers=admin_user.token)
|
||||
assert response.status_code == 400
|
||||
|
||||
|
||||
def test_admin_group_routes_are_restricted(api_client: TestClient, unique_user: TestUser):
|
||||
def test_admin_group_routes_are_restricted(api_client: TestClient, unique_user: TestUser, admin_user: TestUser):
|
||||
response = api_client.get(Routes.base, headers=unique_user.token)
|
||||
assert response.status_code == 403
|
||||
|
||||
response = api_client.post(Routes.base, json={}, headers=unique_user.token)
|
||||
assert response.status_code == 403
|
||||
|
||||
response = api_client.get(Routes.item(1), headers=unique_user.token)
|
||||
response = api_client.get(Routes.item(admin_user.group_id), headers=unique_user.token)
|
||||
assert response.status_code == 403
|
||||
|
||||
response = api_client.get(Routes.user(1), headers=unique_user.token)
|
||||
response = api_client.get(Routes.user(admin_user.group_id), headers=unique_user.token)
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
|
@ -75,5 +75,5 @@ def test_admin_delete_group(api_client: TestClient, admin_user: TestUser, unique
|
|||
assert response.status_code == 200
|
||||
|
||||
# Ensure Group is Deleted
|
||||
response = api_client.get(Routes.item(unique_user.user_id), headers=admin_user.token)
|
||||
response = api_client.get(Routes.item(unique_user.group_id), headers=admin_user.token)
|
||||
assert response.status_code == 404
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
import pytest
|
||||
from uuid import UUID
|
||||
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from tests.utils.assertion_helpers import assert_ignore_keys
|
||||
from tests.utils.fixture_schemas import TestUser
|
||||
|
||||
|
||||
class Routes:
|
||||
base = "/api/groups/cookbooks"
|
||||
|
@ -9,38 +13,45 @@ class Routes:
|
|||
return f"{Routes.base}/{item_id}"
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
def page_data():
|
||||
return {"name": "My New Page", "description": "", "position": 0, "categories": [], "groupId": 1}
|
||||
def get_page_data(group_id: UUID):
|
||||
return {
|
||||
"name": "My New Page",
|
||||
"slug": "my-new-page",
|
||||
"description": "",
|
||||
"position": 0,
|
||||
"categories": [],
|
||||
"group_id": group_id,
|
||||
}
|
||||
|
||||
|
||||
def test_create_cookbook(api_client: TestClient, admin_token, page_data):
|
||||
response = api_client.post(Routes.base, json=page_data, headers=admin_token)
|
||||
|
||||
def test_create_cookbook(api_client: TestClient, unique_user: TestUser):
|
||||
page_data = get_page_data(unique_user.group_id)
|
||||
response = api_client.post(Routes.base, json=page_data, headers=unique_user.token)
|
||||
assert response.status_code == 201
|
||||
|
||||
|
||||
def test_read_cookbook(api_client: TestClient, page_data, admin_token):
|
||||
response = api_client.get(Routes.item(1), headers=admin_token)
|
||||
def test_read_cookbook(api_client: TestClient, unique_user: TestUser):
|
||||
page_data = get_page_data(unique_user.group_id)
|
||||
|
||||
page_data["id"] = 1
|
||||
page_data["slug"] = "my-new-page"
|
||||
|
||||
assert response.json() == page_data
|
||||
response = api_client.get(Routes.item(1), headers=unique_user.token)
|
||||
assert_ignore_keys(response.json(), page_data)
|
||||
|
||||
|
||||
def test_update_cookbook(api_client: TestClient, page_data, admin_token):
|
||||
def test_update_cookbook(api_client: TestClient, unique_user: TestUser):
|
||||
page_data = get_page_data(unique_user.group_id)
|
||||
|
||||
page_data["id"] = 1
|
||||
page_data["name"] = "My New Name"
|
||||
response = api_client.put(Routes.item(1), json=page_data, headers=admin_token)
|
||||
|
||||
response = api_client.put(Routes.item(1), json=page_data, headers=unique_user.token)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
def test_delete_cookbook(api_client: TestClient, admin_token):
|
||||
response = api_client.delete(Routes.item(1), headers=admin_token)
|
||||
def test_delete_cookbook(api_client: TestClient, unique_user: TestUser):
|
||||
response = api_client.delete(Routes.item(1), headers=unique_user.token)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
response = api_client.get(Routes.item(1), headers=admin_token)
|
||||
response = api_client.get(Routes.item(1), headers=unique_user.token)
|
||||
assert response.status_code == 404
|
||||
|
|
|
@ -9,20 +9,15 @@ class Routes:
|
|||
user = "/api/users/self"
|
||||
|
||||
|
||||
GROUP_ID = 1
|
||||
ADMIN_ID = 1
|
||||
USER_ID = 2
|
||||
|
||||
|
||||
def test_ownership_on_new_with_admin(api_client: TestClient, admin_token):
|
||||
def test_ownership_on_new_with_admin(api_client: TestClient, admin_user: TestUser):
|
||||
recipe_name = random_string()
|
||||
response = api_client.post(Routes.base, json={"name": recipe_name}, headers=admin_token)
|
||||
response = api_client.post(Routes.base, json={"name": recipe_name}, headers=admin_user.token)
|
||||
assert response.status_code == 201
|
||||
|
||||
recipe = api_client.get(Routes.base + f"/{recipe_name}", headers=admin_token).json()
|
||||
recipe = api_client.get(Routes.base + f"/{recipe_name}", headers=admin_user.token).json()
|
||||
|
||||
assert recipe["userId"] == ADMIN_ID
|
||||
assert recipe["groupId"] == GROUP_ID
|
||||
assert recipe["userId"] == admin_user.user_id
|
||||
assert recipe["groupId"] == admin_user.group_id
|
||||
|
||||
|
||||
def test_ownership_on_new_with_user(api_client: TestClient, g2_user: TestUser):
|
||||
|
|
|
@ -4,6 +4,7 @@ from mealie.core.config import get_app_dirs, get_app_settings
|
|||
from mealie.core.settings.db_providers import SQLiteProvider
|
||||
|
||||
os.environ["PRODUCTION"] = "True"
|
||||
os.environ["TESTING"] = "True"
|
||||
|
||||
settings = get_app_settings()
|
||||
app_dirs = get_app_dirs()
|
||||
|
|
|
@ -1,10 +1,15 @@
|
|||
from dataclasses import dataclass
|
||||
from typing import Any
|
||||
from uuid import UUID
|
||||
|
||||
|
||||
@dataclass
|
||||
class TestUser:
|
||||
email: str
|
||||
user_id: int
|
||||
group_id: int
|
||||
_group_id: UUID
|
||||
token: Any
|
||||
|
||||
@property
|
||||
def group_id(self) -> str:
|
||||
return str(self._group_id)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue