DB models

packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx

@@ -39,7 +39,7 @@ function makePayee(name: string, options?: { favorite: boolean }): PayeeEntity {
   return {
     id: name.toLowerCase() + '-id',
     name,
-    favorite: options?.favorite ? 1 : 0,
+    favorite: options?.favorite ? true : false,
     transfer_acct: undefined,
   };
 }

packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx

@@ -319,7 +319,7 @@ export function PayeeAutocomplete({
       return filteredSuggestions;
     }
 
-    return [{ id: 'new', favorite: 0, name: '' }, ...filteredSuggestions];
+    return [{ id: 'new', favorite: false, name: '' }, ...filteredSuggestions];
   }, [commonPayees, payees, focusTransferPayees, accounts, hasPayeeInput]);
 
   const dispatch = useDispatch();

packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

@@ -230,8 +230,8 @@ function AccountList({
   const { t } = useTranslation();
   const failedAccounts = useFailedAccounts();
   const syncingAccountIds = useSelector(state => state.account.accountsSyncing);
-  const onBudgetAccounts = accounts.filter(account => account.offbudget === 0);
-  const offBudgetAccounts = accounts.filter(account => account.offbudget === 1);
+  const onBudgetAccounts = accounts.filter(account => !account.offbudget);
+  const offBudgetAccounts = accounts.filter(account => account.offbudget);
 
   return (
     <Page

packages/desktop-client/src/components/modals/CloseAccountModal.tsx

@@ -30,11 +30,11 @@ function needsCategory(
   accounts: AccountEntity[],
 ) {
   const acct = accounts.find(a => a.id === currentTransfer);
-  const isOffBudget = acct && acct.offbudget === 1;
+  const isOffBudget = acct && acct.offbudget;
 
   // The user must select a category if transferring from a budgeted
   // account to an off budget account
-  return account.offbudget === 0 && isOffBudget;
+  return !account.offbudget && isOffBudget;
 }
 
 type CloseAccountModalProps = {
@@ -49,7 +49,7 @@ export function CloseAccountModal({
   canDelete,
 }: CloseAccountModalProps) {
   const { t } = useTranslation(); // Initialize translation hook
-  const accounts = useAccounts().filter(a => a.closed === 0);
+  const accounts = useAccounts().filter(a => !a.closed);
   const { grouped: categoryGroups, list: categories } = useCategories();
   const [loading, setLoading] = useState(false);
   const [transferAccountId, setTransferAccountId] = useState('');

packages/desktop-client/src/components/payees/ManagePayees.tsx

@@ -154,16 +154,16 @@ export const ManagePayees = ({
   function onFavorite() {
     const allFavorited = [...selected.items]
       .map(id => payeesById[id].favorite)
-      .every(f => f === 1);
+      .every(f => f === true);
     if (allFavorited) {
       onBatchChange({
-        updated: [...selected.items].map(id => ({ id, favorite: 0 })),
+        updated: [...selected.items].map(id => ({ id, favorite: false })),
         added: [],
         deleted: [],
       });
     } else {
       onBatchChange({
-        updated: [...selected.items].map(id => ({ id, favorite: 1 })),
+        updated: [...selected.items].map(id => ({ id, favorite: true })),
         added: [],
         deleted: [],
       });
@@ -174,16 +174,22 @@ export const ManagePayees = ({
   function onLearn() {
     const allLearnCategories = [...selected.items]
       .map(id => payeesById[id].learn_categories)
-      .every(f => f === 1);
+      .every(f => f === true);
     if (allLearnCategories) {
       onBatchChange({
-        updated: [...selected.items].map(id => ({ id, learn_categories: 0 })),
+        updated: [...selected.items].map(id => ({
+          id,
+          learn_categories: false,
+        })),
         added: [],
         deleted: [],
       });
     } else {
       onBatchChange({
-        updated: [...selected.items].map(id => ({ id, learn_categories: 1 })),
+        updated: [...selected.items].map(id => ({
+          id,
+          learn_categories: true,
+        })),
         added: [],
         deleted: [],
       });

packages/desktop-client/src/components/payees/PayeeTableRow.tsx

@@ -179,13 +179,13 @@ export const PayeeTableRow = memo(
                   onDelete(id);
                   break;
                 case 'favorite':
-                  onUpdate(id, 'favorite', payee.favorite ? 0 : 1);
+                  onUpdate(id, 'favorite', payee.favorite ? false : true);
                   break;
                 case 'learn':
                   onUpdate(
                     id,
                     'learn_categories',
-                    payee.learn_categories ? 0 : 1,
+                    payee.learn_categories ? false : true,
                   );
                   break;
                 case 'view-rules':

packages/desktop-client/src/components/transactions/TransactionsTable.test.tsx

@@ -52,16 +52,16 @@ const payees: PayeeEntity[] = [
   {
     id: 'bob-id',
     name: 'Bob',
-    favorite: 1,
+    favorite: true,
   },
   {
     id: 'alice-id',
     name: 'Alice',
-    favorite: 1,
+    favorite: true,
   },
   {
     id: 'guy',
-    favorite: 0,
+    favorite: false,
     name: 'This guy on the side of the road',
   },
 ];

packages/desktop-client/src/hooks/useClosedAccounts.ts

@@ -4,8 +4,5 @@ import { useAccounts } from './useAccounts';
 
 export function useClosedAccounts() {
   const accounts = useAccounts();
-  return useMemo(
-    () => accounts.filter(account => account.closed === 1),
-    [accounts],
-  );
+  return useMemo(() => accounts.filter(account => account.closed), [accounts]);
 }

packages/desktop-client/src/hooks/useOffBudgetAccounts.ts

@@ -5,10 +5,7 @@ import { useAccounts } from './useAccounts';
 export function useOffBudgetAccounts() {
   const accounts = useAccounts();
   return useMemo(
-    () =>
-      accounts.filter(
-        account => account.closed === 0 && account.offbudget === 1,
-      ),
+    () => accounts.filter(account => !account.closed && account.offbudget),
     [accounts],
   );
 }

packages/desktop-client/src/hooks/useOnBudgetAccounts.ts

@@ -5,10 +5,7 @@ import { useAccounts } from './useAccounts';
 export function useOnBudgetAccounts() {
   const accounts = useAccounts();
   return useMemo(
-    () =>
-      accounts.filter(
-        account => account.closed === 0 && account.offbudget === 0,
-      ),
+    () => accounts.filter(account => !account.closed && !account.offbudget),
     [accounts],
   );
 }

packages/loot-core/src/client/transfer.test.ts

@@ -1,5 +1,6 @@
 // @ts-strict-ignore
 import * as db from '../server/db';
+import { transactionModel } from '../server/models';
 
 import * as transfer from './transfer';
 
@@ -22,7 +23,7 @@ async function createTransaction(account: string, amount: number, extra = {}) {
     ...extra,
   };
   transaction.id = await db.insertTransaction(transaction);
-  return await db.getTransaction(transaction.id);
+  return transactionModel.fromDbView(await db.getTransaction(transaction.id));
 }
 
 describe('Transfer', () => {

packages/loot-core/src/mocks/budget.ts

@@ -461,13 +461,13 @@ async function fillOther(handlers, account, payees, groups) {
 async function createBudget(accounts, payees, groups) {
   const primaryAccount = accounts.find(a => (a.name = 'Bank of America'));
   const earliestDate = (
-    await db.first<TransactionEntity>(
+    await db.first<db.DbViewTransaction>(
       `SELECT * FROM v_transactions t LEFT JOIN accounts a ON t.account = a.id
        WHERE a.offbudget = 0 AND t.is_child = 0 ORDER BY date ASC LIMIT 1`,
     )
   ).date;
   const earliestPrimaryDate = (
-    await db.first<TransactionEntity>(
+    await db.first<db.DbViewTransaction>(
       `SELECT * FROM v_transactions t LEFT JOIN accounts a ON t.account = a.id
        WHERE a.id = ? AND a.offbudget = 0 AND t.is_child = 0 ORDER BY date ASC LIMIT 1`,
       [primaryAccount.id],

packages/loot-core/src/mocks/index.ts

@@ -25,10 +25,10 @@ export function generateAccount(
     name,
     bankId: null,
     bankName: null,
-    offbudget: offbudget ? 1 : 0,
+    offbudget: offbudget ? true : false,
     sort_order: 0,
-    tombstone: 0,
-    closed: 0,
+    tombstone: false,
+    closed: false,
     ...emptySyncFields(),
   };
 

packages/loot-core/src/server/accounts/link.ts

@@ -1,11 +1,10 @@
 // @ts-strict-ignore
 import { v4 as uuidv4 } from 'uuid';
 
-import { BankEntity } from '../../types/models';
 import * as db from '../db';
 
 export async function findOrCreateBank(institution, requisitionId) {
-  const bank = await db.first<Pick<BankEntity, 'id' | 'bank_id'>>(
+  const bank = await db.first<Pick<db.DbBank, 'id' | 'bank_id'>>(
     'SELECT id, bank_id, name FROM banks WHERE bank_id = ?',
     [requisitionId],
   );

packages/loot-core/src/server/accounts/parse-file.test.ts

@@ -2,7 +2,6 @@
 import * as d from 'date-fns';
 
 import { amountToInteger } from '../../shared/util';
-import { TransactionEntity } from '../../types/models';
 import * as db from '../db';
 import * as prefs from '../prefs';
 
@@ -23,7 +22,7 @@ afterAll(() => {
 });
 
 async function getTransactions(accountId) {
-  return db.runQuery<TransactionEntity>(
+  return db.runQuery<db.DbTransaction>(
     'SELECT * FROM transactions WHERE acct = ?',
     [accountId],
     true,

packages/loot-core/src/server/accounts/payees.ts

@@ -1,11 +1,10 @@
 // @ts-strict-ignore
-import { CategoryEntity, PayeeEntity } from '../../types/models';
 import * as db from '../db';
 
 export async function createPayee(description) {
   // Check to make sure no payee already exists with exactly the same
   // name
-  const row = await db.first<Pick<PayeeEntity, 'id'>>(
+  const row = await db.first<Pick<db.DbPayee, 'id'>>(
     `SELECT id FROM payees WHERE UNICODE_LOWER(name) = ? AND tombstone = 0`,
     [description.toLowerCase()],
   );
@@ -18,14 +17,14 @@ export async function createPayee(description) {
 }
 
 export async function getStartingBalancePayee() {
-  let category = await db.first<CategoryEntity>(`
+  let category = await db.first<db.DbCategory>(`
     SELECT * FROM categories
       WHERE is_income = 1 AND
       LOWER(name) = 'starting balances' AND
       tombstone = 0
   `);
   if (category === null) {
-    category = await db.first<CategoryEntity>(
+    category = await db.first<db.DbCategory>(
       'SELECT * FROM categories WHERE is_income = 1 AND tombstone = 0',
     );
   }

packages/loot-core/src/server/accounts/sync.test.ts

@@ -1,6 +1,5 @@
 // @ts-strict-ignore
 import * as monthUtils from '../../shared/months';
-import { TransactionEntity } from '../../types/models';
 import * as db from '../db';
 import { loadMappings } from '../db/mappings';
 import { post } from '../post';
@@ -25,7 +24,7 @@ beforeEach(async () => {
 });
 
 function getAllTransactions() {
-  return db.all<TransactionEntity & { payee_name: string }>(
+  return db.all<db.DbViewTransactionInternal & { payee_name: string }>(
     `SELECT t.*, p.name as payee_name
        FROM v_transactions_internal t
        LEFT JOIN payees p ON p.id = t.payee

packages/loot-core/src/server/accounts/sync.ts

@@ -454,7 +454,7 @@ export async function reconcileTransactions(
       }
 
       if (existing.is_parent && existing.cleared !== updates.cleared) {
-        const children = await db.all<Pick<TransactionEntity, 'id'>>(
+        const children = await db.all<Pick<db.DbViewTransaction, 'id'>>(
           'SELECT id FROM v_transactions WHERE parent_id = ?',
           [existing.id],
         );
@@ -527,7 +527,7 @@ export async function matchTransactions(
   );
 
   // The first pass runs the rules, and preps data for fuzzy matching
-  const accounts: AccountEntity[] = await db.getAccounts();
+  const accounts = await db.getAccounts();
   const accountsMap = new Map(accounts.map(account => [account.id, account]));
 
   const transactionsStep1 = [];
@@ -546,7 +546,7 @@ export async function matchTransactions(
     // is the highest fidelity match and should always be attempted
     // first.
     if (trans.imported_id) {
-      match = await db.first<TransactionEntity>(
+      match = await db.first<db.DbViewTransaction>(
         'SELECT * FROM v_transactions WHERE imported_id = ? AND account = ?',
         [trans.imported_id, acctId],
       );
@@ -680,7 +680,7 @@ export async function addTransactions(
     { rawPayeeName: true },
   );
 
-  const accounts: AccountEntity[] = await db.getAccounts();
+  const accounts: db.DbAccount[] = await db.getAccounts();
   const accountsMap = new Map(accounts.map(account => [account.id, account]));
 
   for (const { trans: originalTrans, subtransactions } of normalized) {

packages/loot-core/src/server/accounts/transaction-rules.test.ts

@@ -1,6 +1,6 @@
 // @ts-strict-ignore
 import { q } from '../../shared/query';
-import { RawRuleEntity, RuleEntity } from '../../types/models';
+import { RuleEntity } from '../../types/models';
 import { runQuery } from '../aql';
 import * as db from '../db';
 import { loadMappings } from '../db/mappings';
@@ -941,13 +941,13 @@ describe('Learning categories', () => {
 
     // Internally, it should still be stored with the internal names
     // so that it's backwards compatible
-    const { conditions, actions, ...rawRule } = await db.first<RawRuleEntity>(
-      'SELECT * FROM rules',
-    );
+    const rawRule = await db.first<db.DbRule>('SELECT * FROM rules');
     const parsedRule: RuleEntity = {
-      conditions: JSON.parse(conditions),
-      actions: JSON.parse(actions),
       ...rawRule,
+      conditions: JSON.parse(rawRule.conditions),
+      actions: JSON.parse(rawRule.actions),
+      conditionsOp: rawRule.conditions_op as RuleEntity['conditionsOp'],
+      stage: rawRule.stage as RuleEntity['stage'],
     };
     expect(parsedRule.conditions[0].field).toBe('imported_description');
     const action = parsedRule.actions[0];
@@ -977,13 +977,13 @@ describe('Learning categories', () => {
     // This rule internally has been stored with the public names.
     // Making this work now allows us to switch to it by default in
     // the future
-    const { conditions, actions, ...rawRule } = await db.first<RawRuleEntity>(
-      'SELECT * FROM rules',
-    );
+    const rawRule = await db.first<db.DbRule>('SELECT * FROM rules');
     const parsedRule: RuleEntity = {
-      conditions: JSON.parse(conditions),
-      actions: JSON.parse(actions),
       ...rawRule,
+      conditions: JSON.parse(rawRule.conditions),
+      actions: JSON.parse(rawRule.actions),
+      conditionsOp: rawRule.conditions_op as RuleEntity['conditionsOp'],
+      stage: rawRule.stage as RuleEntity['stage'],
     };
     expect(parsedRule.conditions[0].field).toBe('imported_payee');
     const action = parsedRule.actions[0];