feat: pension rights earning

Author: williamleven

src/lib/ForecastGraph.svelte

@@ -5,11 +5,14 @@
 
 	export let simulation: Array<YearState>;
 
-	$: data = simulation.map(({ iskSavings, year, cashFlow }) => ({
-		year: new Date(year, 1),
-		savings: iskSavings,
-		cashFlow
-	}));
+	$: data = simulation.map(
+		({ iskSavings, year, cashFlow, premiumPensionRights, incomePensionRights }) => ({
+			year: new Date(year, 1),
+			savings: iskSavings,
+			cashFlow,
+			pensionRights: premiumPensionRights + incomePensionRights
+		})
+	);
 
 	export let width = 800;
 	export let height = 600;
@@ -22,8 +25,8 @@
 	$: xScale = d3.scaleUtc([minYear ?? 0, maxYear ?? 0], [margin.left, width - margin.right]);
 	$: yScale = d3.scaleLinear(
 		[
-			d3.min(data, (d) => Math.min(d.cashFlow, d.savings)) ?? 0,
-			d3.max(data, (d) => Math.max(d.cashFlow, d.savings)) ?? 1
+			d3.min(data, (d) => Math.min(d.cashFlow, d.savings, d.pensionRights)) ?? 0,
+			d3.max(data, (d) => Math.max(d.cashFlow, d.savings, d.pensionRights)) ?? 1
 		],
 		[height - margin.bottom, margin.top]
 	);
@@ -33,6 +36,11 @@
 		.x((d) => xScale(d.year))
 		.y((d) => yScale(d.savings));
 
+	$: pensionRightsLine = d3
+		.line<{ year: Date; pensionRights: number }>()
+		.x((d) => xScale(d.year))
+		.y((d) => yScale(d.pensionRights));
+
 	$: cashFlowLine = d3
 		.line<{ year: Date; cashFlow: number }>()
 		.x((d) => xScale(d.year))
@@ -67,6 +75,7 @@
 	<!-- Add the path for the line -->
 	<path d={savingsLine(data)} fill="none" stroke="steelblue" stroke-width="1.5" />
 	<path d={cashFlowLine(data)} fill="none" stroke="green" stroke-width="1.5" />
+	<path d={pensionRightsLine(data)} fill="none" stroke="red" stroke-width="1.5" />
 </svg>
 
 <style>

src/lib/simulation.ts

@@ -12,8 +12,8 @@ export interface YearState {
 	iskSavings: number;
 	compoundedInflation: number;
 	cashFlow: number;
-	//incomePensionRights: number;
-	//premiumPensionRights: number;
+	incomePensionRights: number;
+	premiumPensionRights: number;
 	//servicePensionSavings: number;
 }
 
@@ -28,14 +28,19 @@ export interface Parameters {
 	stateTaxRate: number;
 	stateTaxThreshold: number;
 	taxFreeThreshold: number;
+	publicPensionContributionThreshold: number;
+	incomePensionContributionRate: number;
+	incomePensionRate: number;
+	premiumPensionContributionRate: number;
+	premiumPensionRate: number;
 }
 
 export interface TimeBoundCashFlow {
 	startYear: number; // Inclusive
 	endYear?: number; // Exclusive
 	yearlyCashFlow: number;
 	kind: 'GrossTaxableEarnedIncome' | 'NetExpense';
-	//publicPensionContributing: boolean;
+	publicPensionContributing: boolean; // Only used for GrossTaxableEarnedIncome
 	//servicePensionContribution: number;
 }
 
@@ -58,21 +63,26 @@ export function defaultScenario(): Scenario {
 			stateTaxRate: 0.2,
 			stateTaxThreshold: 52000 * 12,
 			taxFreeThreshold: 24238,
+			publicPensionContributionThreshold: 571500,
+			incomePensionContributionRate: 0.16,
+			incomePensionRate: 0.033,
+			premiumPensionContributionRate: 0.025,
+			premiumPensionRate: 0.074,
 			cashFlows: [
 				{
 					startYear: currentYear,
 					endYear: currentYear + 9,
 					yearlyCashFlow: 52000 * 12,
-					kind: 'GrossTaxableEarnedIncome'
-					// publicPensionContributing: true,
+					kind: 'GrossTaxableEarnedIncome',
+					publicPensionContributing: true
 					// servicePensionContribution: 4.5
 				},
 				{
 					startYear: currentYear,
 					endYear: undefined,
 					yearlyCashFlow: 15000 * 12,
-					kind: 'NetExpense'
-					// pensionContributing: false,
+					kind: 'NetExpense',
+					publicPensionContributing: false
 					// publicPensionContributing: false,
 					// servicePensionContribution: 0
 				}
@@ -82,7 +92,9 @@ export function defaultScenario(): Scenario {
 			year: currentYear,
 			iskSavings: 1000000,
 			compoundedInflation: 1,
-			cashFlow: 0
+			cashFlow: 0,
+			premiumPensionRights: 0,
+			incomePensionRights: 0
 		},
 		endYear: 2080
 	};
@@ -104,6 +116,33 @@ function simulateYear(state: YearState, params: Parameters): YearState {
 		return endYear > newYear;
 	});
 
+	const yearlyGrossPublicPensionContributingIncomePostInflation =
+		Math.min(
+			yearlyCashFlows
+				.filter(
+					({ kind, publicPensionContributing }) =>
+						kind === 'GrossTaxableEarnedIncome' && publicPensionContributing
+				)
+				.reduce((acc, cf) => acc + cf.yearlyCashFlow, 0),
+			params.publicPensionContributionThreshold
+		) * compoundedInflationYearlyAverage;
+
+	const incomePensionContributionPostInflation =
+		yearlyGrossPublicPensionContributingIncomePostInflation * params.incomePensionContributionRate;
+	const premiumPensionContributionPostInflation =
+		yearlyGrossPublicPensionContributingIncomePostInflation * params.premiumPensionContributionRate;
+
+	const incomePensionRights =
+		(state.incomePensionRights + incomePensionContributionPostInflation / 2) *
+			(1 + params.incomePensionRate) +
+		incomePensionContributionPostInflation / 2;
+	const premiumPensionRights =
+		(state.premiumPensionRights + premiumPensionContributionPostInflation / 2) *
+			(1 + params.premiumPensionRate) +
+		premiumPensionContributionPostInflation / 2;
+
+	// TODO: arvsvinst: https://www.pensionsmyndigheten.se/statistik/publikationer/orange-rapport-2021/a-berakningsfaktorer.html
+
 	const yearlyGrossTaxableEarnedIncomePostInflation =
 		yearlyCashFlows
 			.filter(({ kind }) => kind === 'GrossTaxableEarnedIncome')
@@ -152,8 +191,9 @@ function simulateYear(state: YearState, params: Parameters): YearState {
 		year: state.year + 1,
 		iskSavings: Math.floor(newSavings),
 		compoundedInflation: compoundedInflation,
-		cashFlow: yearlyNetCashFlowPostInflation
-		// premiumPensionRights: state.premiumPensionRights,
+		cashFlow: yearlyNetCashFlowPostInflation,
+		incomePensionRights: incomePensionRights,
+		premiumPensionRights: premiumPensionRights
 		// servicePensionSavings: state.servicePensionSavings,
 	};
 }