A local-first personal finance app
Extract transaction related server handlers from `main.ts` to `server/transactions/app.ts` (#4221)
Joel Jeremy Marquez8d3b046bef40
diff --git a/packages/loot-core/src/mocks/setup.ts b/packages/loot-core/src/mocks/setup.tsindex 91834cde9d..64ea562bce 100644--- a/packages/loot-core/src/mocks/setup.ts+++ b/packages/loot-core/src/mocks/setup.ts@@ -3,7 +3,6 @@ import * as nativeFs from 'fs';import * as fetchClient from '../platform/client/fetch';import * as sqlite from '../platform/server/sqlite';-import * as rules from '../server/accounts/transaction-rules';import * as db from '../server/db';import {enableGlobalMutations,@@ -12,6 +11,7 @@ import {import { setServer } from '../server/server-config';import * as sheet from '../server/sheet';import { setSyncingMode } from '../server/sync';+import * as rules from '../server/transactions/transaction-rules';import { updateVersion } from '../server/update';import { resetTracer, tracer } from '../shared/test-helpers';diff --git a/packages/loot-core/src/server/accounts/sync.test.ts b/packages/loot-core/src/server/accounts/sync.test.tsindex b4356875c3..f4514ca4e1 100644--- a/packages/loot-core/src/server/accounts/sync.test.ts+++ b/packages/loot-core/src/server/accounts/sync.test.ts@@ -4,9 +4,9 @@ import * as db from '../db';import { loadMappings } from '../db/mappings';import { post } from '../post';import { getServer } from '../server-config';+import { loadRules, insertRule } from '../transactions/transaction-rules';import { reconcileTransactions, addTransactions } from './sync';-import { loadRules, insertRule } from './transaction-rules';jest.mock('../../shared/months', () => ({...jest.requireActual('../../shared/months'),diff --git a/packages/loot-core/src/server/accounts/sync.ts b/packages/loot-core/src/server/accounts/sync.tsindex 44fac2eeb6..168883ebb3 100644--- a/packages/loot-core/src/server/accounts/sync.ts+++ b/packages/loot-core/src/server/accounts/sync.ts@@ -26,6 +26,8 @@ import { runMutator } from '../mutators';import { post } from '../post';import { getServer } from '../server-config';import { batchMessages } from '../sync';+import { batchUpdateTransactions } from '../transactions';+import { runRules } from '../transactions/transaction-rules';import {defaultMappings,mappingsFromString,@@ -33,8 +35,6 @@ import {import { getStartingBalancePayee } from './payees';import { title } from './title';-import { runRules } from './transaction-rules';-import { batchUpdateTransactions } from './transactions';function BankSyncError(type: string, code: string, details?: object) {return { type: 'BankSyncError', category: type, code, details };diff --git a/packages/loot-core/src/server/api.ts b/packages/loot-core/src/server/api.tsindex 6a39dd5b5e..63e1ec7c14 100644--- a/packages/loot-core/src/server/api.ts+++ b/packages/loot-core/src/server/api.ts@@ -461,12 +461,14 @@ handlers['api/transactions-export'] = async function ({transactions,categoryGroups,payees,+ accounts,}) {checkFileOpen();return handlers['transactions-export']({transactions,categoryGroups,payees,+ accounts,});};diff --git a/packages/loot-core/src/server/filters/app.ts b/packages/loot-core/src/server/filters/app.tsindex c6b4ef69c9..8fc22399b1 100644--- a/packages/loot-core/src/server/filters/app.ts+++ b/packages/loot-core/src/server/filters/app.ts@@ -1,11 +1,11 @@// @ts-strict-ignoreimport { v4 as uuidv4 } from 'uuid';-import { parseConditionsOrActions } from '../accounts/transaction-rules';import { createApp } from '../app';import * as db from '../db';import { requiredFields } from '../models';import { mutator } from '../mutators';+import { parseConditionsOrActions } from '../transactions/transaction-rules';import { undoable } from '../undo';import { FiltersHandlers } from './types/handlers';diff --git a/packages/loot-core/src/server/main.test.ts b/packages/loot-core/src/server/main.test.tsindex ea4d871300..39a16890d5 100644--- a/packages/loot-core/src/server/main.test.ts+++ b/packages/loot-core/src/server/main.test.ts@@ -1,5 +1,6 @@// @ts-strict-ignoreimport { getClock, deserializeClock } from '@actual-app/crdt';+import { v4 as uuidv4 } from 'uuid';import { expectSnapshotWithDiffer } from '../mocks/util';import * as connection from '../platform/server/connection';@@ -175,6 +176,7 @@ describe('Budget', () => {// budgets for the earlier monthsawait db.runQuery("INSERT INTO accounts (id, name) VALUES ('one', 'boa')");await runHandler(handlers['transaction-add'], {+ id: uuidv4(),date: '2016-05-06',amount: 50,account: 'one',diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.tsindex 9145391c53..d300e5f3b3 100644--- a/packages/loot-core/src/server/main.ts+++ b/packages/loot-core/src/server/main.ts@@ -15,19 +15,15 @@ import * as sqlite from '../platform/server/sqlite';import { isNonProductionEnvironment } from '../shared/environment';import * as monthUtils from '../shared/months';import { dayFromDate } from '../shared/months';-import { q, Query } from '../shared/query';+import { q } from '../shared/query';import { amountToInteger, stringToInteger } from '../shared/util';import { type Budget } from '../types/budget';import { Handlers } from '../types/handlers';import { OpenIdConfig } from '../types/models/openid';-import { exportToCSV, exportQueryToCSV } from './accounts/export-to-csv';import * as link from './accounts/link';-import { parseFile } from './accounts/parse-file';import { getStartingBalancePayee } from './accounts/payees';import * as bankSync from './accounts/sync';-import * as rules from './accounts/transaction-rules';-import { batchUpdateTransactions } from './accounts/transactions';import { app as adminApp } from './admin/app';import { installAPI } from './api';import { runQuery as aqlQuery } from './aql';@@ -73,6 +69,8 @@ import {} from './sync';import * as syncMigrations from './sync/migrate';import { app as toolsApp } from './tools/app';+import { app as transactionsApp } from './transactions/app';+import * as rules from './transactions/transaction-rules';import { withUndo, clearUndo, undo, redo } from './undo';import { updateVersion } from './update';import {@@ -108,56 +106,6 @@ handlers['redo'] = mutator(function () {return redo();});-handlers['transactions-batch-update'] = mutator(async function ({- added,- deleted,- updated,- learnCategories,-}) {- return withUndo(async () => {- const result = await batchUpdateTransactions({- added,- updated,- deleted,- learnCategories,- });-- return result;- });-});--handlers['transaction-add'] = mutator(async function (transaction) {- await handlers['transactions-batch-update']({ added: [transaction] });- return {};-});--handlers['transaction-update'] = mutator(async function (transaction) {- await handlers['transactions-batch-update']({ updated: [transaction] });- return {};-});--handlers['transaction-delete'] = mutator(async function (transaction) {- await handlers['transactions-batch-update']({ deleted: [transaction] });- return {};-});--handlers['transactions-parse-file'] = async function ({ filepath, options }) {- return parseFile(filepath, options);-};--handlers['transactions-export'] = async function ({- transactions,- accounts,- categoryGroups,- payees,-}) {- return exportToCSV(transactions, accounts, categoryGroups, payees);-};--handlers['transactions-export-query'] = async function ({ query: queryState }) {- return exportQueryToCSV(new Query(queryState));-};-handlers['get-categories'] = async function () {return {grouped: await db.getCategoriesGrouped(),@@ -165,17 +113,6 @@ handlers['get-categories'] = async function () {};};-handlers['get-earliest-transaction'] = async function () {- const { data } = await aqlQuery(- q('transactions')- .options({ splits: 'none' })- .orderBy({ date: 'asc' })- .select('*')- .limit(1),- );- return data[0] || null;-};-handlers['get-budget-bounds'] = async function () {return budget.createAllBudgets();};@@ -2452,6 +2389,7 @@ app.combine(reportsApp,rulesApp,adminApp,+ transactionsApp,);function getDefaultDocumentDir() {diff --git a/packages/loot-core/src/server/rules/app.ts b/packages/loot-core/src/server/rules/app.tsindex df8b60def1..a13de653fc 100644--- a/packages/loot-core/src/server/rules/app.ts+++ b/packages/loot-core/src/server/rules/app.ts@@ -1,15 +1,16 @@// @ts-strict-ignoreimport { type RuleEntity } from '../../types/models';-import { Condition, Action, rankRules } from '../accounts/rules';-import * as rules from '../accounts/transaction-rules';import { createApp } from '../app';import { RuleError } from '../errors';import { mutator } from '../mutators';import { batchMessages } from '../sync';+import * as rules from '../transactions/transaction-rules';import { undoable } from '../undo';import { RulesHandlers } from './types/handlers';+import { Condition, Action, rankRules } from '.';+function validateRule(rule: Partial<RuleEntity>) {// Returns an array of errors, the array is the same link as the// passed-in `array`, or null if there are no errorsdiff --git a/packages/loot-core/src/server/accounts/rules.test.ts b/packages/loot-core/src/server/rules/index.test.tssimilarity index 99%rename from packages/loot-core/src/server/accounts/rules.test.tsrename to packages/loot-core/src/server/rules/index.test.tsindex 6935cb7eeb..e0e5325f6e 100644--- a/packages/loot-core/src/server/accounts/rules.test.ts+++ b/packages/loot-core/src/server/rules/index.test.ts@@ -7,7 +7,7 @@ import {Action,Rule,RuleIndexer,-} from './rules';+} from '.';describe('Condition', () => {test('parses date formats correctly', () => {diff --git a/packages/loot-core/src/server/accounts/rules.ts b/packages/loot-core/src/server/rules/index.tssimilarity index 100%rename from packages/loot-core/src/server/accounts/rules.tsrename to packages/loot-core/src/server/rules/index.tsdiff --git a/packages/loot-core/src/server/rules/types/handlers.ts b/packages/loot-core/src/server/rules/types/handlers.tsindex 766c45f2be..18b76a7ce0 100644--- a/packages/loot-core/src/server/rules/types/handlers.ts+++ b/packages/loot-core/src/server/rules/types/handlers.ts@@ -1,10 +1,10 @@// @ts-strict-ignore+import { type Action } from '..';import {type RuleEntity,type TransactionEntity,type RuleActionEntity,} from '../../../types/models';-import { type Action } from '../../accounts/rules';type ValidationError = {conditionErrors: string[];diff --git a/packages/loot-core/src/server/schedules/app.test.ts b/packages/loot-core/src/server/schedules/app.test.tsindex 2aa6e47c1b..a46ea12de0 100644--- a/packages/loot-core/src/server/schedules/app.test.ts+++ b/packages/loot-core/src/server/schedules/app.test.ts@@ -3,9 +3,9 @@ import MockDate from 'mockdate';import { q } from '../../shared/query';import { getNextDate } from '../../shared/schedules';-import { loadRules, updateRule } from '../accounts/transaction-rules';import { runQuery as aqlQuery } from '../aql';import { loadMappings } from '../db/mappings';+import { loadRules, updateRule } from '../transactions/transaction-rules';import {updateConditions,diff --git a/packages/loot-core/src/server/schedules/app.ts b/packages/loot-core/src/server/schedules/app.tsindex 7016d6f627..06c8e64999 100644--- a/packages/loot-core/src/server/schedules/app.ts+++ b/packages/loot-core/src/server/schedules/app.ts@@ -16,21 +16,21 @@ import {getStatus,recurConfigToRSchedule,} from '../../shared/schedules';-import { Rule } from '../accounts/rules';import { addTransactions } from '../accounts/sync';-import {- getRules,- insertRule,- ruleModel,- updateRule,-} from '../accounts/transaction-rules';import { createApp } from '../app';import { runQuery as aqlQuery } from '../aql';import * as db from '../db';import { toDateRepr } from '../models';import { mutator, runMutator } from '../mutators';import * as prefs from '../prefs';+import { Rule } from '../rules';import { addSyncListener, batchMessages } from '../sync';+import {+ getRules,+ insertRule,+ ruleModel,+ updateRule,+} from '../transactions/transaction-rules';import { undoable } from '../undo';import { Schedule as RSchedule } from '../util/rschedule';diff --git a/packages/loot-core/src/server/schedules/find-schedules.ts b/packages/loot-core/src/server/schedules/find-schedules.tsindex 8b45406138..8d6df7354d 100644--- a/packages/loot-core/src/server/schedules/find-schedules.ts+++ b/packages/loot-core/src/server/schedules/find-schedules.ts@@ -7,10 +7,10 @@ import { q } from '../../shared/query';import { getApproxNumberThreshold } from '../../shared/rules';import { recurConfigToRSchedule } from '../../shared/schedules';import { groupBy } from '../../shared/util';-import { conditionsToAQL } from '../accounts/transaction-rules';import { runQuery as aqlQuery } from '../aql';import * as db from '../db';import { fromDateRepr } from '../models';+import { conditionsToAQL } from '../transactions/transaction-rules';import { Schedule as RSchedule } from '../util/rschedule';import { SchedulesHandlers } from './types/handlers';diff --git a/packages/loot-core/src/server/tools/app.ts b/packages/loot-core/src/server/tools/app.tsindex ceb535c498..60d2327730 100644--- a/packages/loot-core/src/server/tools/app.ts+++ b/packages/loot-core/src/server/tools/app.ts@@ -1,10 +1,10 @@// @ts-strict-ignoreimport { q } from '../../shared/query';-import { batchUpdateTransactions } from '../accounts/transactions';import { createApp } from '../app';import { runQuery } from '../aql';import * as db from '../db';import { runMutator } from '../mutators';+import { batchUpdateTransactions } from '../transactions';import { ToolsHandlers } from './types/handlers';diff --git a/packages/loot-core/src/server/accounts/__snapshots__/transaction-rules.test.ts.snap b/packages/loot-core/src/server/transactions/__snapshots__/transaction-rules.test.ts.snapsimilarity index 100%rename from packages/loot-core/src/server/accounts/__snapshots__/transaction-rules.test.ts.snaprename to packages/loot-core/src/server/transactions/__snapshots__/transaction-rules.test.ts.snapdiff --git a/packages/loot-core/src/server/accounts/__snapshots__/transfer.test.ts.snap b/packages/loot-core/src/server/transactions/__snapshots__/transfer.test.ts.snapsimilarity index 100%rename from packages/loot-core/src/server/accounts/__snapshots__/transfer.test.ts.snaprename to packages/loot-core/src/server/transactions/__snapshots__/transfer.test.ts.snapdiff --git a/packages/loot-core/src/server/transactions/app.ts b/packages/loot-core/src/server/transactions/app.tsnew file mode 100644index 0000000000..d762be8f1c--- /dev/null+++ b/packages/loot-core/src/server/transactions/app.ts@@ -0,0 +1,116 @@+import { q, Query, QueryState } from '../../shared/query';+import {+ AccountEntity,+ CategoryGroupEntity,+ PayeeEntity,+ TransactionEntity,+} from '../../types/models';+import { createApp } from '../app';+import { runQuery } from '../aql';+import { mutator } from '../mutators';+import { undoable } from '../undo';++import { exportQueryToCSV, exportToCSV } from './export/export-to-csv';+import { parseFile, ParseFileOptions } from './import/parse-file';++import { batchUpdateTransactions } from '.';++export type TransactionHandlers = {+ 'transactions-batch-update': typeof handleBatchUpdateTransactions;+ 'transaction-add': typeof addTransaction;+ 'transaction-update': typeof updateTransaction;+ 'transaction-delete': typeof deleteTransaction;+ 'transactions-parse-file': typeof parseTransactionsFile;+ 'transactions-export': typeof exportTransactions;+ 'transactions-export-query': typeof exportTransactionsQuery;+ 'get-earliest-transaction': typeof getEarliestTransaction;+};++async function handleBatchUpdateTransactions({+ added,+ deleted,+ updated,+ learnCategories,+}: Parameters<typeof batchUpdateTransactions>[0]) {+ const result = await batchUpdateTransactions({+ added,+ updated,+ deleted,+ learnCategories,+ });++ return result;+}++async function addTransaction(transaction: TransactionEntity) {+ await handleBatchUpdateTransactions({ added: [transaction] });+ return {};+}++async function updateTransaction(transaction: TransactionEntity) {+ await handleBatchUpdateTransactions({ updated: [transaction] });+ return {};+}++async function deleteTransaction(transaction: Pick<TransactionEntity, 'id'>) {+ await handleBatchUpdateTransactions({ deleted: [transaction] });+ return {};+}++async function parseTransactionsFile({+ filepath,+ options,+}: {+ filepath: string;+ options: ParseFileOptions;+}) {+ return parseFile(filepath, options);+}++async function exportTransactions({+ transactions,+ accounts,+ categoryGroups,+ payees,+}: {+ transactions: TransactionEntity[];+ accounts: AccountEntity[];+ categoryGroups: CategoryGroupEntity[];+ payees: PayeeEntity[];+}) {+ return exportToCSV(transactions, accounts, categoryGroups, payees);+}++async function exportTransactionsQuery({+ query: queryState,+}: {+ query: QueryState;+}) {+ return exportQueryToCSV(new Query(queryState));+}++async function getEarliestTransaction() {+ const { data } = await runQuery(+ q('transactions')+ .options({ splits: 'none' })+ .orderBy({ date: 'asc' })+ .select('*')+ .limit(1),+ );+ return data[0] || null;+}++export const app = createApp<TransactionHandlers>();++app.method(+ 'transactions-batch-update',+ mutator(undoable(handleBatchUpdateTransactions)),+);++app.method('transaction-add', mutator(addTransaction));+app.method('transaction-update', mutator(updateTransaction));+app.method('transaction-delete', mutator(deleteTransaction));+app.method('transactions-parse-file', mutator(parseTransactionsFile));+app.method('transactions-export', mutator(exportTransactions));+app.method('transactions-export-query', mutator(exportTransactionsQuery));+app.method('get-earliest-transaction', getEarliestTransaction);diff --git a/packages/loot-core/src/server/accounts/export-to-csv.ts b/packages/loot-core/src/server/transactions/export/export-to-csv.tssimilarity index 97%rename from packages/loot-core/src/server/accounts/export-to-csv.tsrename to packages/loot-core/src/server/transactions/export/export-to-csv.tsindex 7b8dda5af4..7035069fd1 100644--- a/packages/loot-core/src/server/accounts/export-to-csv.ts+++ b/packages/loot-core/src/server/transactions/export/export-to-csv.ts@@ -1,8 +1,8 @@// @ts-strict-ignoreimport csvStringify from 'csv-stringify/lib/sync';-import { integerToAmount } from '../../shared/util';-import { runQuery as aqlQuery } from '../aql';+import { integerToAmount } from '../../../shared/util';+import { runQuery as aqlQuery } from '../../aql';export async function exportToCSV(transactions,diff --git a/packages/loot-core/src/server/accounts/__snapshots__/parse-file.test.ts.snap b/packages/loot-core/src/server/transactions/import/__snapshots__/parse-file.test.ts.snapsimilarity index 100%rename from packages/loot-core/src/server/accounts/__snapshots__/parse-file.test.ts.snaprename to packages/loot-core/src/server/transactions/import/__snapshots__/parse-file.test.ts.snapdiff --git a/packages/loot-core/src/server/accounts/ofx2json.ts b/packages/loot-core/src/server/transactions/import/ofx2json.tssimilarity index 98%rename from packages/loot-core/src/server/accounts/ofx2json.tsrename to packages/loot-core/src/server/transactions/import/ofx2json.tsindex b5ad38faa8..91fc8abeb5 100644--- a/packages/loot-core/src/server/accounts/ofx2json.ts+++ b/packages/loot-core/src/server/transactions/import/ofx2json.ts@@ -1,7 +1,7 @@// @ts-strict-ignoreimport { parseStringPromise } from 'xml2js';-import { dayFromDate } from '../../shared/months';+import { dayFromDate } from '../../../shared/months';type OFXTransaction = {amount: string;diff --git a/packages/loot-core/src/server/accounts/parse-file.test.ts b/packages/loot-core/src/server/transactions/import/parse-file.test.tssimilarity index 85%rename from packages/loot-core/src/server/accounts/parse-file.test.tsrename to packages/loot-core/src/server/transactions/import/parse-file.test.tsindex 04cfc9f089..9fbfff4df8 100644--- a/packages/loot-core/src/server/accounts/parse-file.test.ts+++ b/packages/loot-core/src/server/transactions/import/parse-file.test.ts@@ -1,12 +1,12 @@// @ts-strict-ignoreimport * as d from 'date-fns';-import { amountToInteger } from '../../shared/util';-import * as db from '../db';-import * as prefs from '../prefs';+import { amountToInteger } from '../../../shared/util';+import { reconcileTransactions } from '../../accounts/sync';+import * as db from '../../db';+import * as prefs from '../../prefs';import { parseFile } from './parse-file';-import { reconcileTransactions } from './sync';beforeEach(global.emptyDatabase());@@ -65,7 +65,7 @@ describe('File import', () => {await db.insertAccount({ id: 'one', name: 'one' });const { errors } = await importFileWithRealTime('one',- __dirname + '/../../mocks/files/data.qif',+ __dirname + '/../../../mocks/files/data.qif','MM/dd/yy',);expect(errors.length).toBe(0);@@ -78,7 +78,7 @@ describe('File import', () => {const { errors } = await importFileWithRealTime('one',- __dirname + '/../../mocks/files/data.ofx',+ __dirname + '/../../../mocks/files/data.ofx',);expect(errors.length).toBe(0);expect(await getTransactions('one')).toMatchSnapshot();@@ -90,7 +90,7 @@ describe('File import', () => {const { errors } = await importFileWithRealTime('one',- __dirname + '/../../mocks/files/credit-card.ofx',+ __dirname + '/../../../mocks/files/credit-card.ofx',);expect(errors.length).toBe(0);expect(await getTransactions('one')).toMatchSnapshot();@@ -102,7 +102,7 @@ describe('File import', () => {const { errors } = await importFileWithRealTime('one',- __dirname + '/../../mocks/files/data.qfx',+ __dirname + '/../../../mocks/files/data.qfx',);expect(errors.length).toBe(0);expect(await getTransactions('one')).toMatchSnapshot();@@ -114,13 +114,13 @@ describe('File import', () => {let res = await importFileWithRealTime('one',- __dirname + '/../../mocks/files/best.data-ever$.QFX',+ __dirname + '/../../../mocks/files/best.data-ever$.QFX',);expect(res.errors.length).toBe(0);res = await importFileWithRealTime('one',- __dirname + '/../../mocks/files/big.data.QiF',+ __dirname + '/../../../mocks/files/big.data.QiF','MM/dd/yy',);expect(res.errors.length).toBe(0);@@ -136,7 +136,7 @@ describe('File import', () => {const { errors } = await importFileWithRealTime('one',- __dirname + '/../../mocks/files/8859-1.qfx',+ __dirname + '/../../../mocks/files/8859-1.qfx','yyyy-MM-dd',);expect(errors.length).toBe(0);@@ -149,7 +149,7 @@ describe('File import', () => {const { errors } = await importFileWithRealTime('one',- __dirname + '/../../mocks/files/html-vals.qfx',+ __dirname + '/../../../mocks/files/html-vals.qfx','yyyy-MM-dd',);expect(errors.length).toBe(0);@@ -162,7 +162,7 @@ describe('File import', () => {const { errors } = await importFileWithRealTime('one',- __dirname + '/../../mocks/files/camt/camt.053.xml',+ __dirname + '/../../../mocks/files/camt/camt.053.xml',);expect(errors.length).toBe(0);expect(await getTransactions('one')).toMatchSnapshot();diff --git a/packages/loot-core/src/server/accounts/parse-file.ts b/packages/loot-core/src/server/transactions/import/parse-file.tssimilarity index 96%rename from packages/loot-core/src/server/accounts/parse-file.tsrename to packages/loot-core/src/server/transactions/import/parse-file.tsindex fd6178411c..f551306018 100644--- a/packages/loot-core/src/server/accounts/parse-file.ts+++ b/packages/loot-core/src/server/transactions/import/parse-file.ts@@ -1,8 +1,8 @@// @ts-strict-ignoreimport csv2json from 'csv-parse/lib/sync';-import * as fs from '../../platform/server/fs';-import { looselyParseAmount } from '../../shared/util';+import * as fs from '../../../platform/server/fs';+import { looselyParseAmount } from '../../../shared/util';import { ofx2json } from './ofx2json';import { qif2json } from './qif2json';@@ -14,7 +14,7 @@ export type ParseFileResult = {transactions?: unknown[];};-type ParseFileOptions = {+export type ParseFileOptions = {hasHeaderRow?: boolean;delimiter?: string;fallbackMissingPayeeToMemo?: boolean;diff --git a/packages/loot-core/src/server/accounts/qif2json.ts b/packages/loot-core/src/server/transactions/import/qif2json.tssimilarity index 100%rename from packages/loot-core/src/server/accounts/qif2json.tsrename to packages/loot-core/src/server/transactions/import/qif2json.tsdiff --git a/packages/loot-core/src/server/accounts/xmlcamt2json.ts b/packages/loot-core/src/server/transactions/import/xmlcamt2json.tssimilarity index 100%rename from packages/loot-core/src/server/accounts/xmlcamt2json.tsrename to packages/loot-core/src/server/transactions/import/xmlcamt2json.tsdiff --git a/packages/loot-core/src/server/accounts/transactions.ts b/packages/loot-core/src/server/transactions/index.tssimilarity index 99%rename from packages/loot-core/src/server/accounts/transactions.tsrename to packages/loot-core/src/server/transactions/index.tsindex cacc9dbd4b..e306d74913 100644--- a/packages/loot-core/src/server/accounts/transactions.ts+++ b/packages/loot-core/src/server/transactions/index.ts@@ -1,4 +1,5 @@// @ts-strict-ignore+import * as connection from '../../platform/server/connection';import { Diff } from '../../shared/util';import { PayeeEntity, TransactionEntity } from '../../types/models';diff --git a/packages/loot-core/src/server/accounts/transaction-rules.test.ts b/packages/loot-core/src/server/transactions/transaction-rules.test.tssimilarity index 100%rename from packages/loot-core/src/server/accounts/transaction-rules.test.tsrename to packages/loot-core/src/server/transactions/transaction-rules.test.tsdiff --git a/packages/loot-core/src/server/accounts/transaction-rules.ts b/packages/loot-core/src/server/transactions/transaction-rules.tssimilarity index 99%rename from packages/loot-core/src/server/accounts/transaction-rules.tsrename to packages/loot-core/src/server/transactions/transaction-rules.tsindex 4e644f5952..40448d3ac4 100644--- a/packages/loot-core/src/server/accounts/transaction-rules.ts+++ b/packages/loot-core/src/server/transactions/transaction-rules.ts@@ -1,4 +1,5 @@// @ts-strict-ignore+import {currentDay,addDays,@@ -21,8 +22,6 @@ import { getPayee, getPayeeByName, insertPayee, getAccount } from '../db';import { getMappings } from '../db/mappings';import { RuleError } from '../errors';import { requiredFields, toDateRepr } from '../models';-import { batchMessages, addSyncListener } from '../sync';-import {Condition,Action,@@ -32,15 +31,17 @@ import {migrateIds,iterateIds,execActions,-} from './rules';-import { batchUpdateTransactions } from './transactions';+} from '../rules';+import { batchMessages, addSyncListener } from '../sync';++import { batchUpdateTransactions } from '.';// TODO: Detect if it looks like the user is creating a rename rule// and prompt to create it in the pre phase instead// * We could also make the "create rule" button a dropdown that// provides different "templates" like "create renaming rule"-export { iterateIds } from './rules';+export { iterateIds } from '../rules';let allRules;let unlistenSync;diff --git a/packages/loot-core/src/server/accounts/transfer.test.ts b/packages/loot-core/src/server/transactions/transfer.test.tssimilarity index 100%rename from packages/loot-core/src/server/accounts/transfer.test.tsrename to packages/loot-core/src/server/transactions/transfer.test.tsdiff --git a/packages/loot-core/src/server/accounts/transfer.ts b/packages/loot-core/src/server/transactions/transfer.tssimilarity index 100%rename from packages/loot-core/src/server/accounts/transfer.tsrename to packages/loot-core/src/server/transactions/transfer.tsdiff --git a/packages/loot-core/src/shared/schedules.ts b/packages/loot-core/src/shared/schedules.tsindex 584f66fe4f..d41370c2f2 100644--- a/packages/loot-core/src/shared/schedules.ts+++ b/packages/loot-core/src/shared/schedules.ts@@ -2,7 +2,7 @@import type { IRuleOptions } from '@rschedule/core';import * as d from 'date-fns';-import { Condition } from '../server/accounts/rules';+import { Condition } from '../server/rules';import * as monthUtils from './months';import { q } from './query';diff --git a/packages/loot-core/src/types/api-handlers.d.ts b/packages/loot-core/src/types/api-handlers.d.tsindex 37ca533668..1d31dc097f 100644--- a/packages/loot-core/src/types/api-handlers.d.ts+++ b/packages/loot-core/src/types/api-handlers.d.ts@@ -1,6 +1,5 @@import { ImportTransactionsOpts } from '@actual-app/api';-import { type batchUpdateTransactions } from '../server/accounts/transactions';import type {APIAccountEntity,APICategoryEntity,@@ -8,6 +7,7 @@ import type {APIFileEntity,APIPayeeEntity,} from '../server/api-models';+import { type batchUpdateTransactions } from '../server/transactions';import type { NewRuleEntity, RuleEntity, TransactionEntity } from './models';import { type ServerHandlers } from './server-handlers';@@ -76,6 +76,7 @@ export interface ApiHandlers {transactions;categoryGroups;payees;+ accounts;}) => Promise<unknown>;'api/transactions-import': (arg: {diff --git a/packages/loot-core/src/types/handlers.d.ts b/packages/loot-core/src/types/handlers.d.tsindex cf5b2c1bec..5fc1d912a7 100644--- a/packages/loot-core/src/types/handlers.d.ts+++ b/packages/loot-core/src/types/handlers.d.ts@@ -8,6 +8,7 @@ import type { ReportsHandlers } from '../server/reports/types/handlers';import type { RulesHandlers } from '../server/rules/types/handlers';import type { SchedulesHandlers } from '../server/schedules/types/handlers';import type { ToolsHandlers } from '../server/tools/types/handlers';+import type { TransactionHandlers } from '../server/transactions/app';import type { ApiHandlers } from './api-handlers';import type { ServerHandlers } from './server-handlers';@@ -23,6 +24,7 @@ export interface HandlersReportsHandlers,RulesHandlers,SchedulesHandlers,+ TransactionHandlers,AdminHandlers,ToolsHandlers {}diff --git a/packages/loot-core/src/types/server-handlers.d.ts b/packages/loot-core/src/types/server-handlers.d.tsindex 71dd1ec9cb..c3d68b382a 100644--- a/packages/loot-core/src/types/server-handlers.d.ts+++ b/packages/loot-core/src/types/server-handlers.d.ts@@ -1,12 +1,9 @@import { ImportTransactionsOpts } from '@actual-app/api';-import { ParseFileResult } from '../server/accounts/parse-file';-import { batchUpdateTransactions } from '../server/accounts/transactions';import { Backup } from '../server/backups';import { RemoteFile } from '../server/cloud-storage';import { Node as SpreadsheetNode } from '../server/spreadsheet/spreadsheet';import { Message } from '../server/sync';-import { QueryState } from '../shared/query';import { Budget } from './budget';import {@@ -26,34 +23,9 @@ import { Query } from './query';import { EmptyObject } from './util';export interface ServerHandlers {- 'transaction-update': (transaction: { id: string }) => Promise<EmptyObject>;-undo: () => Promise<void>;-redo: () => Promise<void>;- 'transactions-batch-update': (- ...arg: Parameters<typeof batchUpdateTransactions>- ) => ReturnType<typeof batchUpdateTransactions>;-- 'transaction-add': (transaction) => Promise<EmptyObject>;-- 'transaction-delete': (transaction) => Promise<EmptyObject>;-- 'transactions-parse-file': (arg: {- filepath: string;- options;- }) => Promise<ParseFileResult>;-- 'transactions-export': (arg: {- transactions;- accounts?;- categoryGroups;- payees;- }) => Promise<unknown>;-- 'transactions-export-query': (arg: { query: QueryState }) => Promise<string>;-'get-categories': () => Promise<{grouped: Array<CategoryGroupEntity>;list: Array<CategoryEntity>;diff --git a/upcoming-release-notes/4221.md b/upcoming-release-notes/4221.mdnew file mode 100644index 0000000000..a1e71ca183--- /dev/null+++ b/upcoming-release-notes/4221.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [joel-jeremy]+---++Move transactions related server handlers from main.ts to server/transactions/app.ts