A local-first personal finance app
Template only the relevant amount in a split-schedule category (#2652)
Julian Dominguez-Schatzaff5bba4ec2d
diff --git a/packages/loot-core/src/server/accounts/rules.ts b/packages/loot-core/src/server/accounts/rules.tsindex ab7ccd11d3..96e9cd1d89 100644--- a/packages/loot-core/src/server/accounts/rules.ts+++ b/packages/loot-core/src/server/accounts/rules.ts@@ -673,17 +673,16 @@ export class Rule {});}- execActions(object) {+ execActions<T>(object: T): Partial<T> {const result = execActions(this.actions, {...object,- subtransactions: object.subtransactions,});const changes = Object.keys(result).reduce((prev, cur) => {if (result[cur] !== object[cur]) {prev[cur] = result[cur];}return prev;- }, {});+ }, {} as T);return changes;}diff --git a/packages/loot-core/src/server/budget/goals/goalsSchedule.ts b/packages/loot-core/src/server/budget/goals/goalsSchedule.tsindex 6efdd323c4..8d90453250 100644--- a/packages/loot-core/src/server/budget/goals/goalsSchedule.ts+++ b/packages/loot-core/src/server/budget/goals/goalsSchedule.ts@@ -22,15 +22,28 @@ async function createScheduleList(template, current_month, category) {const conditions = rule.serialize().conditions;const { date: dateConditions, amount: amountCondition } =extractScheduleConds(conditions);- const sign = category.is_income ? 1 : -1;- const target =+ const scheduleAmount =amountCondition.op === 'isbetween'- ? (sign *- Math.round(- amountCondition.value.num1 + amountCondition.value.num2,- )) /+ ? Math.round(amountCondition.value.num1 + amountCondition.value.num2) /2- : sign * amountCondition.value;+ : amountCondition.value;+ const { amount: postRuleAmount, subtransactions } = rule.execActions({+ amount: scheduleAmount,+ category: category.id,+ subtransactions: [],+ });+ const categorySubtransactions = subtransactions?.filter(+ t => t.category === category.id,+ );++ // Unless the current category is relevant to the schedule, target the post-rule amount.+ const sign = category.is_income ? 1 : -1;+ const target =+ sign *+ (categorySubtransactions?.length+ ? categorySubtransactions.reduce((acc, t) => acc + t.amount, 0)+ : postRuleAmount ?? scheduleAmount);+const next_date_string = getNextDate(dateConditions,monthUtils._parse(current_month),diff --git a/packages/loot-core/src/server/schedules/app.ts b/packages/loot-core/src/server/schedules/app.tsindex 1bd4c0eb01..ea99443d4b 100644--- a/packages/loot-core/src/server/schedules/app.ts+++ b/packages/loot-core/src/server/schedules/app.ts@@ -107,7 +107,7 @@ export function getNextDate(return null;}-export async function getRuleForSchedule(id) {+export async function getRuleForSchedule(id: string | null): Promise<Rule> {if (id == null) {throw new Error('Schedule not attached to a rule');}diff --git a/upcoming-release-notes/2652.md b/upcoming-release-notes/2652.mdnew file mode 100644index 0000000000..3196e7dddf--- /dev/null+++ b/upcoming-release-notes/2652.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [jfdoming]+---++Template only the relevant amount in a split-schedule category