diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1dabf43..eed28e5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,7 +47,7 @@ repos: - id: mypy additional_dependencies: - aiopathlib - - asyncio-for-ynab + - asyncio-for-ynab~=1.84.0 - rich>=10 language_version: python3.12 - repo: https://github.com/zizmorcore/zizmor-pre-commit diff --git a/README.md b/README.md index 5dcb65c..546a76b 100644 --- a/README.md +++ b/README.md @@ -506,7 +506,7 @@ WITH params AS ( TRUE AND NOT c.deleted AND c.category_group_name != 'Credit Card Payments' - AND c.category_group_name != 'Internal Master Category' + AND NOT c.internal AND ( v.include_category_groups = '' OR EXISTS ( diff --git a/setup.cfg b/setup.cfg index 49ae67a..7df5eb6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,7 +22,7 @@ install_requires = aiohttp>=3 aiopathlib aiosqlite - asyncio-for-ynab + asyncio-for-ynab~=1.84.0 fasteners rich>=10 tenacity diff --git a/sqlite_export_for_ynab/ddl/create-relations.sql b/sqlite_export_for_ynab/ddl/create-relations.sql index 075c58a..be7fb23 100644 --- a/sqlite_export_for_ynab/ddl/create-relations.sql +++ b/sqlite_export_for_ynab/ddl/create-relations.sql @@ -56,6 +56,7 @@ CREATE TABLE IF NOT EXISTS category_groups ( , plan_id TEXT , name TEXT , hidden BOOLEAN + , internal BOOLEAN , deleted BOOLEAN , FOREIGN KEY (plan_id) REFERENCES plans (id) ) @@ -68,6 +69,7 @@ CREATE TABLE IF NOT EXISTS categories ( , category_group_name TEXT , name TEXT , hidden BOOLEAN + , internal BOOLEAN , original_category_group_id TEXT , note TEXT , budgeted INT diff --git a/testing/fixtures.py b/testing/fixtures.py index d55500e..0929acd 100644 --- a/testing/fixtures.py +++ b/testing/fixtures.py @@ -156,6 +156,7 @@ id=UUID(CATEGORY_GROUP_ID_1), name=CATEGORY_GROUP_NAME_1, hidden=False, + internal=False, deleted=False, categories=[ Category( @@ -164,6 +165,7 @@ category_group_name=CATEGORY_GROUP_NAME_1, name=CATEGORY_NAME_1, hidden=False, + internal=False, original_category_group_id=None, note=None, budgeted=14500, @@ -206,6 +208,7 @@ category_group_name=CATEGORY_GROUP_NAME_1, name=CATEGORY_NAME_2, hidden=False, + internal=False, original_category_group_id=None, note=None, budgeted=10250, @@ -248,6 +251,7 @@ id=UUID(CATEGORY_GROUP_ID_2), name=CATEGORY_GROUP_NAME_2, hidden=False, + internal=False, deleted=False, categories=[ Category( @@ -256,6 +260,7 @@ category_group_name=CATEGORY_GROUP_NAME_2, name=CATEGORY_NAME_3, hidden=False, + internal=False, original_category_group_id=None, note=None, budgeted=15000, @@ -298,6 +303,7 @@ category_group_name=CATEGORY_GROUP_NAME_2, name=CATEGORY_NAME_4, hidden=False, + internal=False, original_category_group_id=None, note=None, budgeted=20000, diff --git a/tests/_main_test.py b/tests/_main_test.py index 3c68b31..ef1682f 100644 --- a/tests/_main_test.py +++ b/tests/_main_test.py @@ -255,6 +255,7 @@ async def test_insert_category_groups(context): "name": CATEGORY_GROUP_NAME_1, "plan_id": PLAN_ID_1, "hidden": False, + "internal": False, "deleted": False, }, { @@ -262,6 +263,7 @@ async def test_insert_category_groups(context): "name": CATEGORY_GROUP_NAME_2, "plan_id": PLAN_ID_1, "hidden": False, + "internal": False, "deleted": False, }, ], @@ -277,6 +279,7 @@ async def test_insert_category_groups(context): "plan_id": PLAN_ID_1, "name": CATEGORY_NAME_1, "hidden": False, + "internal": False, "original_category_group_id": None, "note": None, "budgeted": 14500, @@ -319,6 +322,7 @@ async def test_insert_category_groups(context): "plan_id": PLAN_ID_1, "name": CATEGORY_NAME_2, "hidden": False, + "internal": False, "original_category_group_id": None, "note": None, "budgeted": 10250, @@ -361,6 +365,7 @@ async def test_insert_category_groups(context): "plan_id": PLAN_ID_1, "name": CATEGORY_NAME_3, "hidden": False, + "internal": False, "original_category_group_id": None, "note": None, "budgeted": 15000, @@ -403,6 +408,7 @@ async def test_insert_category_groups(context): "plan_id": PLAN_ID_1, "name": CATEGORY_NAME_4, "hidden": False, + "internal": False, "original_category_group_id": None, "note": None, "budgeted": 20000, @@ -458,6 +464,7 @@ async def test_insert_category_group_without_categories(context): "name": CATEGORY_GROUP_NAME_1, "plan_id": PLAN_ID_1, "hidden": False, + "internal": False, "deleted": False, }, ],