Skip to content

A local-first personal finance app

Extract payees related server handlers from main.ts to server/payees/app.ts (#4443)

Joel Jeremy Marquez4fb5bbca349a
diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx
index 65fece7809..10c16b5101 100644
--- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx
+++ b/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,
};
}
diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx
index 0b14526a9e..e5b623eaea 100644
--- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx
@@ -317,7 +317,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();
diff --git a/packages/desktop-client/src/components/payees/ManagePayees.tsx b/packages/desktop-client/src/components/payees/ManagePayees.tsx
index d650c53a40..61ecdfc587 100644
--- a/packages/desktop-client/src/components/payees/ManagePayees.tsx
+++ b/packages/desktop-client/src/components/payees/ManagePayees.tsx
@@ -70,7 +70,7 @@ function PayeeTableHeader() {
type ManagePayeesProps = {
payees: PayeeEntity[];
ruleCounts: ComponentProps<typeof PayeeTable>['ruleCounts'];
- orphanedPayees: PayeeEntity[];
+ orphanedPayees: Array<Pick<PayeeEntity, 'id'>>;
initialSelectedIds: string[];
onBatchChange: (diff: Diff<PayeeEntity>) => void;
onViewRules: ComponentProps<typeof PayeeTable>['onViewRules'];
@@ -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);
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);
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: [],
});
diff --git a/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx b/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx
index dbb1d65cec..911e607b7a 100644
--- a/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx
+++ b/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx
@@ -27,7 +27,7 @@ export function ManagePayeesWithData({
const dispatch = useDispatch();
const [ruleCounts, setRuleCounts] = useState({ value: new Map() });
- const [orphans, setOrphans] = useState<PayeeEntity[]>([]);
+ const [orphans, setOrphans] = useState<Array<Pick<PayeeEntity, 'id'>>>([]);
const refetchOrphanedPayees = useCallback(async () => {
const orphs = await send('payees-get-orphaned');
@@ -127,7 +127,6 @@ export function ManagePayeesWithData({
initialSelectedIds={initialSelectedIds}
onBatchChange={async (changes: Diff<PayeeEntity>) => {
await send('payees-batch-change', changes);
- await dispatch(getPayees());
setOrphans(applyChanges(changes, orphans));
}}
onMerge={async ([targetId, ...mergeIds]) => {
diff --git a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx
index 24de3c42b6..d2560b9536 100644
--- a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx
+++ b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx
@@ -180,14 +180,10 @@ export const PayeeTableRow = memo(
onDelete(id);
break;
case 'favorite':
- onUpdate(id, 'favorite', payee.favorite ? 0 : 1);
+ onUpdate(id, 'favorite', !payee.favorite);
break;
case 'learn':
- onUpdate(
- id,
- 'learn_categories',
- payee.learn_categories ? 0 : 1,
- );
+ onUpdate(id, 'learn_categories', !payee.learn_categories);
break;
case 'view-rules':
onViewRules(id);
diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.test.tsx b/packages/desktop-client/src/components/transactions/TransactionsTable.test.tsx
index 64aee99236..e631804a9b 100644
--- a/packages/desktop-client/src/components/transactions/TransactionsTable.test.tsx
+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.test.tsx
@@ -56,16 +56,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',
},
];
diff --git a/packages/loot-core/src/server/aql/schema/index.ts b/packages/loot-core/src/server/aql/schema/index.ts
index 7f271d8756..ec279944e4 100644
--- a/packages/loot-core/src/server/aql/schema/index.ts
+++ b/packages/loot-core/src/server/aql/schema/index.ts
@@ -63,6 +63,7 @@ export const schema = {
transfer_acct: f('id', { ref: 'accounts' }),
tombstone: f('boolean'),
favorite: f('boolean'),
+ learn_categories: f('boolean'),
},
accounts: {
id: f('id'),
diff --git a/packages/loot-core/src/server/db/index.ts b/packages/loot-core/src/server/db/index.ts
index ad5262cebc..43316d2194 100644
--- a/packages/loot-core/src/server/db/index.ts
+++ b/packages/loot-core/src/server/db/index.ts
@@ -16,6 +16,7 @@ import * as sqlite from '../../platform/server/sqlite';
import * as monthUtils from '../../shared/months';
import { groupById } from '../../shared/util';
import { CategoryEntity, CategoryGroupEntity } from '../../types/models';
+import { WithRequired } from '../../types/util';
import {
schema,
schemaConfig,
@@ -514,9 +515,11 @@ export async function getAccount(id: DbAccount['id']) {
return first<DbAccount>(`SELECT * FROM accounts WHERE id = ?`, [id]);
}
-export async function insertPayee(payee) {
+export async function insertPayee(
+ payee: WithRequired<Partial<DbPayee>, 'name'>,
+) {
payee = payeeModel.validate(payee);
- let id;
+ let id: DbPayee['id'];
await batchMessages(async () => {
id = await insertWithUUID('payees', payee);
await insert('payee_mapping', { id, targetId: id });
@@ -549,7 +552,7 @@ export async function deleteTransferPayee(payee: Pick<DbPayee, 'id'>) {
return delete_('payees', payee.id);
}
-export function updatePayee(payee) {
+export function updatePayee(payee: WithRequired<Partial<DbPayee>, 'id'>) {
payee = payeeModel.validate(payee, { update: true });
return update('payees', payee);
}
@@ -594,7 +597,7 @@ export async function mergePayees(
});
}
-export function getPayees() {
+export function getPayees(): Promise<DbPayee[]> {
return all(`
SELECT p.*, COALESCE(a.name, p.name) AS name FROM payees p
LEFT JOIN accounts a ON (p.transfer_acct = a.id AND a.tombstone = 0)
@@ -603,7 +606,7 @@ export function getPayees() {
`);
}
-export function getCommonPayees() {
+export function getCommonPayees(): Promise<DbPayee[]> {
const twelveWeeksAgo = toDateRepr(
monthUtils.subWeeks(monthUtils.currentDate(), 12),
);
@@ -645,11 +648,11 @@ const orphanedPayeesQuery = `
`;
/* eslint-enable rulesdir/typography */
-export function syncGetOrphanedPayees() {
+export function syncGetOrphanedPayees(): Promise<Array<Pick<DbPayee, 'id'>>> {
return all(orphanedPayeesQuery);
}
-export async function getOrphanedPayees() {
+export async function getOrphanedPayees(): Promise<Array<DbPayee['id']>> {
const rows = await all(orphanedPayeesQuery);
return rows.map(row => row.id);
}
diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.ts
index 10107b3467..d8a366225b 100644
--- a/packages/loot-core/src/server/main.ts
+++ b/packages/loot-core/src/server/main.ts
@@ -42,6 +42,7 @@ import { handleBudgetImport } from './importers';
import { app } from './main-app';
import { mutator, runHandler } from './mutators';
import { app as notesApp } from './notes/app';
+import { app as payeesApp } from './payees/app';
import * as Platform from './platform';
import { get, post } from './post';
import { app as preferencesApp } from './preferences/app';
@@ -55,18 +56,18 @@ import { resolveName, unresolveName } from './spreadsheet/util';
import {
initialFullSync,
fullSync,
- batchMessages,
setSyncingMode,
makeTestMessage,
clearFullSyncTimeout,
resetSync,
repairSync,
+ batchMessages,
} 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 { clearUndo, undo, redo, withUndo } from './undo';
import { updateVersion } from './update';
import {
uniqueBudgetName,
@@ -377,77 +378,6 @@ handlers['must-category-transfer'] = async function ({ id }) {
});
};
-handlers['payee-create'] = mutator(async function ({ name }) {
- return withUndo(async () => {
- return db.insertPayee({ name });
- });
-});
-
-handlers['common-payees-get'] = async function () {
- return db.getCommonPayees();
-};
-
-handlers['payees-get'] = async function () {
- return db.getPayees();
-};
-
-handlers['payees-get-orphaned'] = async function () {
- return db.syncGetOrphanedPayees();
-};
-
-handlers['payees-get-rule-counts'] = async function () {
- const payeeCounts = {};
-
- rules.iterateIds(rules.getRules(), 'payee', (rule, id) => {
- if (payeeCounts[id] == null) {
- payeeCounts[id] = 0;
- }
- payeeCounts[id]++;
- });
-
- return payeeCounts;
-};
-
-handlers['payees-merge'] = mutator(async function ({ targetId, mergeIds }) {
- return withUndo(
- async () => {
- return db.mergePayees(targetId, mergeIds);
- },
- { targetId, mergeIds },
- );
-});
-
-handlers['payees-batch-change'] = mutator(async function ({
- added,
- deleted,
- updated,
-}) {
- return withUndo(async () => {
- return batchMessages(async () => {
- if (deleted) {
- await Promise.all(deleted.map(p => db.deletePayee(p)));
- }
-
- if (added) {
- await Promise.all(added.map(p => db.insertPayee(p)));
- }
-
- if (updated) {
- await Promise.all(updated.map(p => db.updatePayee(p)));
- }
- });
- });
-});
-
-handlers['payees-check-orphaned'] = async function ({ ids }) {
- const orphaned = new Set(await db.getOrphanedPayees());
- return ids.filter(id => orphaned.has(id));
-};
-
-handlers['payees-get-rules'] = async function ({ id }) {
- return rules.getRulesForPayee(id).map(rule => rule.serialize());
-};
-
handlers['make-filters-from-conditions'] = async function ({
conditions,
applySpecialCases,
@@ -1491,6 +1421,7 @@ app.combine(
adminApp,
transactionsApp,
accountsApp,
+ payeesApp,
);
export function getDefaultDocumentDir() {
diff --git a/packages/loot-core/src/server/models.ts b/packages/loot-core/src/server/models.ts
index 772ead3f15..dfab26b130 100644
--- a/packages/loot-core/src/server/models.ts
+++ b/packages/loot-core/src/server/models.ts
@@ -1,10 +1,13 @@
-import {
- AccountEntity,
- CategoryEntity,
- CategoryGroupEntity,
- PayeeEntity,
-} from '../types/models';
+import { PayeeEntity } from '../types/models';
+import {
+ convertForInsert,
+ convertForUpdate,
+ convertFromSelect,
+ schema,
+ schemaConfig,
+} from './aql';
+import { DbAccount, DbCategory, DbCategoryGroup, DbPayee } from './db';
import { ValidationError } from './errors';
export function requiredFields<T extends object, K extends keyof T>(
@@ -50,7 +53,7 @@ export function fromDateRepr(number: number) {
}
export const accountModel = {
- validate(account: AccountEntity, { update }: { update?: boolean } = {}) {
+ validate(account: Partial<DbAccount>, { update }: { update?: boolean } = {}) {
requiredFields(
'account',
account,
@@ -58,12 +61,15 @@ export const accountModel = {
update,
);
- return account;
+ return account as DbAccount;
},
};
export const categoryModel = {
- validate(category: CategoryEntity, { update }: { update?: boolean } = {}) {
+ validate(
+ category: Partial<DbCategory>,
+ { update }: { update?: boolean } = {},
+ ) {
requiredFields(
'category',
category,
@@ -72,13 +78,13 @@ export const categoryModel = {
);
const { sort_order, ...rest } = category;
- return { ...rest, hidden: rest.hidden ? 1 : 0 };
+ return { ...rest, hidden: rest.hidden ? 1 : 0 } as DbCategory;
},
};
export const categoryGroupModel = {
validate(
- categoryGroup: CategoryGroupEntity,
+ categoryGroup: Partial<DbCategoryGroup>,
{ update }: { update?: boolean } = {},
) {
requiredFields(
@@ -89,13 +95,28 @@ export const categoryGroupModel = {
);
const { sort_order, ...rest } = categoryGroup;
- return { ...rest, hidden: rest.hidden ? 1 : 0 };
+ return { ...rest, hidden: rest.hidden ? 1 : 0 } as DbCategoryGroup;
},
};
export const payeeModel = {
- validate(payee: PayeeEntity, { update }: { update?: boolean } = {}) {
- requiredFields('payee', payee, ['name'], update);
- return payee;
+ validate(payee: Partial<DbPayee>, { update }: { update?: boolean } = {}) {
+ requiredFields('payee', payee, update ? [] : ['name'], update);
+ return payee as DbPayee;
+ },
+ toDb(payee: PayeeEntity, { update }: { update?: boolean } = {}): DbPayee {
+ return (
+ update
+ ? convertForUpdate(schema, schemaConfig, 'payees', payee)
+ : convertForInsert(schema, schemaConfig, 'payees', payee)
+ ) as DbPayee;
+ },
+ fromDb(payee: DbPayee): PayeeEntity {
+ return convertFromSelect(
+ schema,
+ schemaConfig,
+ 'payees',
+ payee,
+ ) as PayeeEntity;
},
};
diff --git a/packages/loot-core/src/server/payees/app.ts b/packages/loot-core/src/server/payees/app.ts
new file mode 100644
index 0000000000..7fa95935da
--- /dev/null
+++ b/packages/loot-core/src/server/payees/app.ts
@@ -0,0 +1,126 @@
+import { Diff } from '../../shared/util';
+import { PayeeEntity, RuleEntity } from '../../types/models';
+import { createApp } from '../app';
+import * as db from '../db';
+import { payeeModel } from '../models';
+import { mutator } from '../mutators';
+import { batchMessages } from '../sync';
+import * as rules from '../transactions/transaction-rules';
+import { undoable } from '../undo';
+
+export type PayeesHandlers = {
+ 'payee-create': typeof createPayee;
+ 'common-payees-get': typeof getCommonPayees;
+ 'payees-get': typeof getPayees;
+ 'payees-get-orphaned': typeof getOrphanedPayees;
+ 'payees-get-rule-counts': typeof getPayeeRuleCounts;
+ 'payees-merge': typeof mergePayees;
+ 'payees-batch-change': typeof batchChangePayees;
+ 'payees-check-orphaned': typeof checkOrphanedPayees;
+ 'payees-get-rules': typeof getPayeeRules;
+};
+
+export const app = createApp<PayeesHandlers>();
+app.method('payee-create', mutator(undoable(createPayee)));
+app.method('common-payees-get', getCommonPayees);
+app.method('payees-get', getPayees);
+app.method('payees-get-orphaned', getOrphanedPayees);
+app.method('payees-get-rule-counts', getPayeeRuleCounts);
+app.method(
+ 'payees-merge',
+ mutator(
+ undoable(mergePayees, args => ({
+ mergeIds: args.mergeIds,
+ targetId: args.targetId,
+ })),
+ ),
+);
+app.method('payees-batch-change', mutator(undoable(batchChangePayees)));
+app.method('payees-check-orphaned', checkOrphanedPayees);
+app.method('payees-get-rules', getPayeeRules);
+
+async function createPayee({ name }: { name: PayeeEntity['name'] }) {
+ return db.insertPayee({ name });
+}
+
+// Server must return AQL entities not the raw DB data
+async function getCommonPayees(): Promise<PayeeEntity[]> {
+ return (await db.getCommonPayees()).map(payeeModel.fromDb);
+}
+
+// Server must return AQL entities not the raw DB data
+async function getPayees(): Promise<PayeeEntity[]> {
+ return (await db.getPayees()).map(payeeModel.fromDb);
+}
+
+async function getOrphanedPayees(): Promise<Array<Pick<PayeeEntity, 'id'>>> {
+ return await db.syncGetOrphanedPayees();
+}
+
+async function getPayeeRuleCounts() {
+ const payeeCounts: Record<PayeeEntity['id'], number> = {};
+
+ rules.iterateIds(rules.getRules(), 'payee', (rule, id) => {
+ if (payeeCounts[id] == null) {
+ payeeCounts[id] = 0;
+ }
+ payeeCounts[id]++;
+ });
+
+ return payeeCounts;
+}
+
+async function mergePayees({
+ targetId,
+ mergeIds,
+}: {
+ targetId: PayeeEntity['id'];
+ mergeIds: Array<PayeeEntity['id']>;
+}) {
+ await db.mergePayees(targetId, mergeIds);
+}
+
+async function batchChangePayees({
+ added,
+ deleted,
+ updated,
+}: Partial<Diff<PayeeEntity>>): Promise<void> {
+ await batchMessages(async () => {
+ if (deleted) {
+ await Promise.all(
+ deleted.map(p => ({ id: p.id })).map(p => db.deletePayee(p)),
+ );
+ }
+
+ if (added) {
+ await Promise.all(
+ added.map(p => payeeModel.toDb(p)).map(p => db.insertPayee(p)),
+ );
+ }
+
+ if (updated) {
+ await Promise.all(
+ updated
+ .map(p => payeeModel.toDb(p as PayeeEntity, { update: true }))
+ .map(p => db.updatePayee(p)),
+ );
+ }
+ });
+}
+
+async function checkOrphanedPayees({
+ ids,
+}: {
+ ids: Array<PayeeEntity['id']>;
+}): Promise<Array<PayeeEntity['id']>> {
+ const orphaned = new Set(await db.getOrphanedPayees());
+ return ids.filter(id => orphaned.has(id));
+}
+
+async function getPayeeRules({
+ id,
+}: {
+ id: PayeeEntity['id'];
+}): Promise<RuleEntity[]> {
+ return rules.getRulesForPayee(id).map(rule => rule.serialize());
+}
diff --git a/packages/loot-core/src/server/undo.ts b/packages/loot-core/src/server/undo.ts
index 42f312ad5f..8882d347d1 100644
--- a/packages/loot-core/src/server/undo.ts
+++ b/packages/loot-core/src/server/undo.ts
@@ -91,11 +91,17 @@ export function withUndo<T>(
);
}
-export function undoable<T extends HandlerFunctions>(func: T) {
+export function undoable<T extends HandlerFunctions>(
+ func: T,
+ metaFunc?: (...metaArgs: Parameters<T>) => unknown,
+) {
return (...args: Parameters<T>) => {
- return withUndo<Awaited<ReturnType<T>>>(() => {
- return func.apply(null, args);
- });
+ return withUndo<Awaited<ReturnType<T>>>(
+ () => {
+ return func.apply(null, args);
+ },
+ metaFunc ? metaFunc(...args) : undefined,
+ );
};
}
diff --git a/packages/loot-core/src/shared/util.ts b/packages/loot-core/src/shared/util.ts
index 3b08370d02..38e9c4f52a 100644
--- a/packages/loot-core/src/shared/util.ts
+++ b/packages/loot-core/src/shared/util.ts
@@ -48,7 +48,7 @@ export function hasFieldsChanged<T extends object>(
export type Diff<T extends { id: string }> = {
added: T[];
updated: Partial<T>[];
- deleted: Partial<T>[];
+ deleted: Pick<T, 'id'>[];
};
export function applyChanges<T extends { id: string }>(
@@ -132,9 +132,9 @@ export function diffItems<T extends { id: string }>(
const added: T[] = [];
const updated: Partial<T>[] = [];
- const deleted: Partial<T>[] = items
+ const deleted: Pick<T, 'id'>[] = items
.filter(item => !newGrouped.has(item.id))
- .map(item => ({ id: item.id }) as Partial<T>);
+ .map(item => ({ id: item.id }));
newItems.forEach(newItem => {
const item = grouped.get(newItem.id);
diff --git a/packages/loot-core/src/types/handlers.d.ts b/packages/loot-core/src/types/handlers.d.ts
index 24f666d08d..15f81e6e6d 100644
--- a/packages/loot-core/src/types/handlers.d.ts
+++ b/packages/loot-core/src/types/handlers.d.ts
@@ -4,6 +4,7 @@ import type { BudgetHandlers } from '../server/budget/types/handlers';
import type { DashboardHandlers } from '../server/dashboard/types/handlers';
import type { FiltersHandlers } from '../server/filters/types/handlers';
import type { NotesHandlers } from '../server/notes/types/handlers';
+import type { PayeesHandlers } from '../server/payees/app';
import type { PreferencesHandlers } from '../server/preferences/app';
import type { ReportsHandlers } from '../server/reports/types/handlers';
import type { RulesHandlers } from '../server/rules/types/handlers';
@@ -28,6 +29,7 @@ export interface Handlers
TransactionHandlers,
AdminHandlers,
ToolsHandlers,
- AccountHandlers {}
+ AccountHandlers,
+ PayeesHandlers {}
export type HandlerFunctions = Handlers[keyof Handlers];
diff --git a/packages/loot-core/src/types/models/payee.d.ts b/packages/loot-core/src/types/models/payee.d.ts
index 7b9d0cd429..a559c4b93f 100644
--- a/packages/loot-core/src/types/models/payee.d.ts
+++ b/packages/loot-core/src/types/models/payee.d.ts
@@ -4,7 +4,7 @@ export interface PayeeEntity {
id: string;
name: string;
transfer_acct?: AccountEntity['id'];
- favorite?: 1 | 0;
- learn_categories?: 1 | 0;
+ favorite?: boolean;
+ learn_categories?: boolean;
tombstone?: boolean;
}
diff --git a/packages/loot-core/src/types/server-handlers.d.ts b/packages/loot-core/src/types/server-handlers.d.ts
index 26ff36f190..c4d6b53fb0 100644
--- a/packages/loot-core/src/types/server-handlers.d.ts
+++ b/packages/loot-core/src/types/server-handlers.d.ts
@@ -4,12 +4,7 @@ import { Node as SpreadsheetNode } from '../server/spreadsheet/spreadsheet';
import { Message } from '../server/sync';
import { Budget } from './budget';
-import {
- CategoryEntity,
- CategoryGroupEntity,
- RuleEntity,
- PayeeEntity,
-} from './models';
+import { CategoryEntity, CategoryGroupEntity } from './models';
import { OpenIdConfig } from './models/openid';
// eslint-disable-next-line import/no-unresolved
import { Query } from './query';
@@ -69,27 +64,6 @@ export interface ServerHandlers {
'must-category-transfer': (arg: { id }) => Promise<unknown>;
- 'payee-create': (arg: { name }) => Promise<string>;
-
- 'common-payees-get': () => Promise<PayeeEntity[]>;
-
- 'payees-get': () => Promise<PayeeEntity[]>;
-
- 'payees-get-rule-counts': () => Promise<Record<PayeeEntity['id'], number>>;
-
- 'payees-merge': (arg: { targetId; mergeIds }) => Promise<void>;
-
- 'payees-batch-change': (arg: {
- added?;
- deleted?;
- updated?;
- }) => Promise<unknown>;
-
- 'payees-check-orphaned': (arg: { ids }) => Promise<unknown>;
- 'payees-get-orphaned': () => Promise<PayeeEntity[]>;
-
- 'payees-get-rules': (arg: { id: string }) => Promise<RuleEntity[]>;
-
'make-filters-from-conditions': (arg: {
conditions: unknown;
applySpecialCases?: boolean;
diff --git a/upcoming-release-notes/4443.md b/upcoming-release-notes/4443.md
new file mode 100644
index 0000000000..cef1cc62a9
--- /dev/null
+++ b/upcoming-release-notes/4443.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+Extract payees related server handlers from main.ts to server/payees/app.ts
\ No newline at end of file