Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions app/src/benchmarks/recalc.bench.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { bench, describe } from 'vitest';
import { usePayrollStore } from '../hooks/usePayrollStore';

// setup store
const store = usePayrollStore.getState();
store.setActiveYear(2025);
store.initializeYear(2025);

describe('setTargetNet performance', () => {
bench('setTargetNet (month 1) - full recalc', () => {
store.setTargetNet(1, 3000);
});

bench('setTargetNet (month 6) - partial recalc', () => {
store.setTargetNet(6, 3000);
});

bench('setTargetNet (month 12) - minimal recalc', () => {
store.setTargetNet(12, 3000);
});
});
36 changes: 36 additions & 0 deletions app/src/hooks/usePayrollStore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,40 @@ describe('usePayrollStore', () => {
// Feb Balance = Jan monthlyBonus + Feb monthlyBonus
expect(feb.runningBalance).toBeCloseTo(jan.monthlyBonus + feb.monthlyBonus, 1);
});

it('should produce identical results with partial recalculation vs full recalculation', () => {
const store = usePayrollStore.getState();
store.resetData();
store.initializeYear(2025);

// Scenario A: Incremental updates (uses optimized partial recalc)
act(() => {
store.setTargetNet(1, 3000);
store.setTargetNet(6, 4000);
});

const partialLedger = JSON.parse(JSON.stringify(usePayrollStore.getState().years[2025].ledger));
const resultingEvents = usePayrollStore.getState().salaryEvents;

// Scenario B: Full recalculation from scratch
act(() => {
store.resetData();
usePayrollStore.setState({ salaryEvents: resultingEvents });
store.initializeYear(2025);
});

const fullLedger = usePayrollStore.getState().years[2025].ledger;

expect(partialLedger.length).toBe(12);
expect(fullLedger.length).toBe(12);

for (let i = 0; i < 12; i++) {
expect(partialLedger[i].targetNet).toBe(fullLedger[i].targetNet);
expect(partialLedger[i].grossSalary).toBe(fullLedger[i].grossSalary);
expect(partialLedger[i].netSalary).toBe(fullLedger[i].netSalary);
expect(partialLedger[i].monthlyBonus).toBe(fullLedger[i].monthlyBonus);
expect(partialLedger[i].provisions).toBe(fullLedger[i].provisions);
expect(partialLedger[i].runningBalance).toBe(fullLedger[i].runningBalance);
}
});
});
80 changes: 67 additions & 13 deletions app/src/hooks/usePayrollStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,14 @@ const recalcLedgerForYear = (
yearData: YearData,
year: number,
employee: EmployeeInfo,
salaryEvents: SalaryEvent[]
salaryEvents: SalaryEvent[],
fromMonth: number = 1
) => {
const dependents = employee.dependents;

return yearData.ledger.map(entry => {
if (entry.month < fromMonth) return entry;

const { isInEmployment, daysWorked, proRataFactor } = computeEmploymentForMonth(
employee,
year,
Expand Down Expand Up @@ -393,10 +396,20 @@ export const usePayrollStore = create<PayrollState>()(
const newYears: PayrollState['years'] = {};
for (const [yKey, yData] of Object.entries(state.years)) {
const y = Number(yKey);
newYears[y] = {
...yData,
ledger: recalcLedgerForYear(yData, y, state.employee, salaryEvents),
};

if (y < year) {
newYears[y] = yData;
} else if (y === year) {
newYears[y] = {
...yData,
ledger: recalcLedgerForYear(yData, y, state.employee, salaryEvents, month),
};
} else {
newYears[y] = {
...yData,
ledger: recalcLedgerForYear(yData, y, state.employee, salaryEvents, 1),
};
}
}

return {
Expand Down Expand Up @@ -620,13 +633,27 @@ export const usePayrollStore = create<PayrollState>()(
event,
]);

const [evYearStr, evMonthStr] = event.effectiveMonth.split('-');
const evYear = Number(evYearStr);
const evMonth = Number(evMonthStr);

const newYears: PayrollState['years'] = {};
for (const [yKey, yData] of Object.entries(state.years)) {
const y = Number(yKey);
newYears[y] = {
...yData,
ledger: recalcLedgerForYear(yData, y, state.employee, salaryEvents),
};

if (y < evYear) {
newYears[y] = yData;
} else if (y === evYear) {
newYears[y] = {
...yData,
ledger: recalcLedgerForYear(yData, y, state.employee, salaryEvents, evMonth),
};
} else {
newYears[y] = {
...yData,
ledger: recalcLedgerForYear(yData, y, state.employee, salaryEvents, 1),
};
}
}

return { salaryEvents, years: newYears };
Expand All @@ -636,15 +663,42 @@ export const usePayrollStore = create<PayrollState>()(

removeSalaryEvent: eventId => {
set(state => {
const removedEvent = state.salaryEvents.find(e => e.id === eventId);
const salaryEvents = sortSalaryEvents(state.salaryEvents.filter(e => e.id !== eventId));

let evYear = 0;
let evMonth = 1;

if (removedEvent) {
const [y, m] = removedEvent.effectiveMonth.split('-');
evYear = Number(y);
evMonth = Number(m);
}

const newYears: PayrollState['years'] = {};
for (const [yKey, yData] of Object.entries(state.years)) {
const y = Number(yKey);
newYears[y] = {
...yData,
ledger: recalcLedgerForYear(yData, y, state.employee, salaryEvents),
};

if (removedEvent) {
if (y < evYear) {
newYears[y] = yData;
} else if (y === evYear) {
newYears[y] = {
...yData,
ledger: recalcLedgerForYear(yData, y, state.employee, salaryEvents, evMonth),
};
} else {
newYears[y] = {
...yData,
ledger: recalcLedgerForYear(yData, y, state.employee, salaryEvents, 1),
};
}
} else {
newYears[y] = {
...yData,
ledger: recalcLedgerForYear(yData, y, state.employee, salaryEvents),
};
}
}

return { salaryEvents, years: newYears };
Expand Down