@pax2pay/model-banking 0.1.466 → 0.1.468

package/reports/visa/Data/Monthly.ts

@@ -16,12 +16,11 @@ export namespace Monthly {
 		const month = isoly.DateTime.getMonth(transaction.transacted ?? transaction.posted)
 		return (((month - 1) % 3) + 1) as Monthly.Month
 	}
+	export function empty(): Monthly {
+		return { "1": { count: {}, volume: {} }, "2": { count: {}, volume: {} }, "3": { count: {}, volume: {} } }
+	}
 	export function update(previous: Monthly | undefined, transaction: Transaction.CardTransaction): Monthly {
-		const result: Monthly = previous ?? {
-			"1": { count: {}, volume: {} },
-			"2": { count: {}, volume: {} },
-			"3": { count: {}, volume: {} },
-		}
+		const result: Monthly = previous ?? empty()
 		if (transaction.direction == "outbound" && transaction.status == "finalized") {
 			const month = getMonth(transaction)
 			result[month].count[transaction.account.iin as Iin] =
@@ -42,4 +41,20 @@ export namespace Monthly {
 		}
 		return result
 	}
+	export function merge(previous: Monthly | undefined, addition: Monthly | undefined): Monthly {
+		const result: Monthly = empty()
+		previous ??= empty()
+		addition ??= empty()
+		for (const month of Monthly.Month.values)
+			for (const iin of Iin.values) {
+				result[month].count[iin] = (previous[month].count[iin] ?? 0) + (addition[month].count[iin] ?? 0)
+				result[month].volume[iin] = isoly.Currency.add(
+					"GBP",
+					previous[month].volume[iin] ?? 0,
+					addition[month].volume[iin] ?? 0
+				)
+			}
+
+		return result
+	}
 }

package/reports/visa/Data/NonMonthly.ts

@@ -11,12 +11,14 @@ export type NonMonthly = Record<
 	Partial<Record<Iin, number>>
 >
 export namespace NonMonthly {
-	export const empty: NonMonthly = {
-		"Number of Accounts - International Enabled": {},
-		"Payments Transactions Declined for Insufficient Funds - Number": {},
-		"Total Number of Accounts": {},
-		"Total Number of Active Cards": {},
-		"Total Number of Cards": {},
+	export function empty(): NonMonthly {
+		return {
+			"Number of Accounts - International Enabled": {},
+			"Payments Transactions Declined for Insufficient Funds - Number": {},
+			"Total Number of Accounts": {},
+			"Total Number of Active Cards": {},
+			"Total Number of Cards": {},
+		}
 	}
 	export function update(previous: NonMonthly, transaction: Transaction.CardTransaction): NonMonthly {
 		const result = previous
@@ -33,4 +35,11 @@ export namespace NonMonthly {
 		result += "\n"
 		return result
 	}
+	export function merge(previous: NonMonthly, addition: NonMonthly): NonMonthly {
+		const result: NonMonthly = empty()
+		for (const key of Object.keys(result) as (keyof NonMonthly)[])
+			for (const iin of Iin.values)
+				result[key][iin] = (previous[key]?.[iin] ?? 0) + (addition[key]?.[iin] ?? 0)
+		return result
+	}
 }

package/reports/visa/Data/Regional.ts

@@ -11,6 +11,12 @@ export namespace Regional {
 		result[region] = Monthly.update(result[region], transaction)
 		return result
 	}
+	export function merge(previous: Regional, addition: Regional): Regional {
+		const result: Regional = {}
+		for (const region of Region.values)
+			result[region] = Monthly.merge(previous[region], addition[region])
+		return result
+	}
 	export function toCsvRow(regional: Regional, row: string): string {
 		let result = ""
 		const region = Region.fromRow(row)

package/reports/visa/Data/index.ts

@@ -5,7 +5,7 @@ import { Iin as DataIin } from "./Iin"
 import { NonMonthly } from "./NonMonthly"
 import { Regional } from "./Regional"
 
-export type Data = {
+export interface Data {
 	regional: Regional
 	nonMonthly: NonMonthly
 	country: Data.Country
@@ -14,7 +14,7 @@ export namespace Data {
 	export import Iin = DataIin
 	export import Country = DataCountry
 	export function create(transactions: Transaction.CardTransaction[]): Data {
-		const result: Data = { regional: {}, nonMonthly: NonMonthly.empty, country: {} }
+		const result: Data = { regional: {}, nonMonthly: NonMonthly.empty(), country: {} }
 		for (const transaction of transactions) {
 			result.nonMonthly = NonMonthly.update(result.nonMonthly, transaction)
 			result.regional = Regional.update(result.regional, transaction)
@@ -22,6 +22,14 @@ export namespace Data {
 		}
 		return result
 	}
+	export function merge(previous: Data, addition: Data): Data {
+		const result: Data = {
+			regional: Regional.merge(previous.regional, addition.regional),
+			nonMonthly: NonMonthly.merge(previous.nonMonthly, addition.nonMonthly),
+			country: Data.Country.merge(previous.country, addition.country),
+		}
+		return result
+	}
 	export function toCsv(data: Data, row: rows.NonZero): string {
 		let result: string
 		if (row.endsWith("Month x"))