mv db related classes into app/data

app/activities/NewProduct.py

@@ -20,7 +20,7 @@ from urwid import (
     Text,
 )
 from . import ActivityManager
-from ..db_utils import NON_IDENTIFIER_COLUMNS, QueryManager, get_insert_product_statement
+from ..data.QueryManager import NON_IDENTIFIER_COLUMNS, QueryManager, get_insert_product_statement
 from ..widgets import AutoCompleteEdit, AutoCompletePopUp
 
 class NewProduct(Overlay):

app/activities/Plot.py

@@ -1,5 +1,4 @@
-from app.db_utils import QueryManager
-from app.db_utils import QueryManager, display_mapper
+from app.data.QueryManager import QueryManager, display_mapper
 from datetime import date, datetime
 import seaborn as sns
 import pandas as pd

app/activities/PriceCheck.py

@@ -31,7 +31,7 @@ from ..widgets import (
     NoTabCheckBox,
     FlowBarGraphWithVScale,
 )
-from ..db_utils import QueryManager
+from ..data.QueryManager import QueryManager
 from . import ActivityManager, show_or_exit
 from .Rating import Rating
 

app/activities/RecipeEditor.py

@@ -35,7 +35,7 @@ from ..widgets import (
     NoTabCheckBox,
     FlowBarGraphWithVScale,
 )
-from ..db_utils import QueryManager
+from ..data.QueryManager import QueryManager
 from . import ActivityManager, show_or_exit
 from .Rating import Rating
 import yaml
@@ -270,7 +270,7 @@ class RecipeEditor(FocusWidget):
             lambda x: None not in map(lambda x: x or None, x), [
                 list(map(lambda x: x.get_edit_text(), x)) for x in self.ingredients
         ])))
-        if serves:
+        if self.feeds:
             n, d = self.feeds.as_integer_ratio()
             yml['feeds'] = float(self.feeds) if d != 1 else n
         else:

app/activities/TransactionEditor.py

@@ -24,7 +24,7 @@ from urwid import (
 )
 
 from .. import COPYRIGHT
-from ..db_utils import QueryManager
+from ..data.QueryManager import QueryManager
 from ..widgets import (
     AutoCompleteEdit,
     AutoCompleteFloatEdit,

app/db_utils.py → app/data/QueryManager.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) Daniel Sheffield 2021 - 2022
+# Copyright (c) Daniel Sheffield 2021 - 2023
 #
 # All rights reserved
 #
@@ -7,12 +7,12 @@
 from sqlite3 import Cursor
 import time
 from typing import Any, Callable
-from .txn_view import (
+from .TransactionView import (
     get_table_statement,
     get_transactions_statement,
     get_session_transactions_statement,
 )
-from .price_view import(
+from .PriceView import(
     get_historic_prices_statement,
 )
 from dateutil.parser import parse as parse_time

app/parse_recipe.py

@@ -6,7 +6,7 @@
 # THIS SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY
 import yaml
 from yaml.loader import SafeLoader
-from .db_utils import QueryManager
+from .data.QueryManager import QueryManager
 import re
 
 def parse_recipe(fh, query_manager: QueryManager):

grocery_transactions.py

@@ -10,7 +10,7 @@ from psycopg import Cursor
 from urwid import raw_display, WidgetPlaceholder, SolidFill, MainLoop
 from app.activities import ActivityManager, show_or_exit
 from app.activities.TransactionEditor import TransactionEditor
-from app.db_utils import QueryManager, display_mapper
+from app.data.QueryManager import QueryManager, display_mapper
 from app.palette import solarized
 
 try:

price_check.py

@@ -9,7 +9,7 @@ from psycopg import Cursor
 from urwid import raw_display, WidgetPlaceholder, SolidFill, MainLoop
 from app.activities import ActivityManager, show_or_exit
 from app.activities.PriceCheck import PriceCheck
-from app.db_utils import QueryManager, display_mapper
+from app.data.QueryManager import QueryManager, display_mapper
 from app.palette import high_contrast
 
 try:

recipe.py

@@ -9,7 +9,7 @@ from psycopg import Cursor
 from urwid import raw_display, WidgetPlaceholder, SolidFill, MainLoop
 from app.activities import ActivityManager, show_or_exit
 from app.activities.RecipeEditor import RecipeEditor
-from app.db_utils import QueryManager, display_mapper
+from app.data.QueryManager import QueryManager, display_mapper
 from app.palette import high_contrast
 from app import parse_recipe
 import sys

reconcile.py

@@ -15,8 +15,8 @@ import gnucash
 import sys
 import os
 import psycopg
-from app.db_utils import cursor_as_dict
-from app.txn_view import get_session_transactions_statement as get_statement
+from app.data.QueryManager import cursor_as_dict
+from app.data.TransactionView import get_session_transactions_statement as get_statement
 
 try:
     from db_credentials import HOST, PASSWORD