Alexander/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: implement persistent MongoDB connections and resolve race conditions

Browse Source 
- Replace connect/disconnect pattern with persistent connection pool
- Add explicit database initialization on server startup
- Remove all dbDisconnect() calls from API endpoints to prevent race conditions
- Fix MongoNotConnectedError when scheduler runs concurrently with API requests
- Add connection pooling with proper MongoDB driver options
- Add safety check for recipes array in favorites utility

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Alexander Bocken
2025-09-14 19:53:55 +02:00
parent 08d7d8541b
commit c8e542eec8
28 changed files with 198 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/api/cospend/balance/+server.ts
View File

@@ -1,7 +1,7 @@
import type { RequestHandler } from '@sveltejs/kit';
import { PaymentSplit } from '../../../../models/PaymentSplit';
import { Payment } from '../../../../models/Payment'; // Need to import Payment for populate to work
import { dbConnect, dbDisconnect } from '../../../../utils/db';
import { dbConnect } from '../../../../utils/db';
import { error, json } from '@sveltejs/kit';
export const GET: RequestHandler = async ({ locals, url }) => {
@@ -94,7 +94,5 @@ export const GET: RequestHandler = async ({ locals, url }) => {
} catch (e) {
console.error('Error calculating balance:', e);
throw error(500, 'Failed to calculate balance');
} finally {
await dbDisconnect();
}
};

4
src/routes/api/cospend/debts/+server.ts
View File

@@ -1,7 +1,7 @@
import type { RequestHandler } from '@sveltejs/kit';
import { PaymentSplit } from '../../../../models/PaymentSplit';
import { Payment } from '../../../../models/Payment';
import { dbConnect, dbDisconnect } from '../../../../utils/db';
import { dbConnect } from '../../../../utils/db';
import { error, json } from '@sveltejs/kit';
interface DebtSummary {
@@ -105,6 +105,6 @@ export const GET: RequestHandler = async ({ locals }) => {
console.error('Error calculating debt breakdown:', e);
throw error(500, 'Failed to calculate debt breakdown');
} finally {
await dbDisconnect();
// Connection will be reused
}
};

67
src/routes/api/cospend/payments/+server.ts
View File

@@ -1,7 +1,8 @@
import type { RequestHandler } from '@sveltejs/kit';
import { Payment } from '../../../../models/Payment';
import { PaymentSplit } from '../../../../models/PaymentSplit';
import { dbConnect, dbDisconnect } from '../../../../utils/db';
import { dbConnect } from '../../../../utils/db';
import { convertToCHF, isValidCurrencyCode } from '../../../../lib/utils/currency';
import { error, json } from '@sveltejs/kit';
export const GET: RequestHandler = async ({ locals, url }) => {
@@ -27,7 +28,7 @@ export const GET: RequestHandler = async ({ locals, url }) => {
} catch (e) {
throw error(500, 'Failed to fetch payments');
} finally {
await dbDisconnect();
// Connection will be reused
}
};
@@ -38,7 +39,7 @@ export const POST: RequestHandler = async ({ request, locals }) => {
}
const data = await request.json();
const { title, description, amount, paidBy, date, image, category, splitMethod, splits } = data;
const { title, description, amount, currency, paidBy, date, image, category, splitMethod, splits } = data;
if (!title || !amount || !paidBy || !splitMethod || !splits) {
throw error(400, 'Missing required fields');
@@ -56,6 +57,12 @@ export const POST: RequestHandler = async ({ request, locals }) => {
throw error(400, 'Invalid category');
}
// Validate currency if provided
const inputCurrency = currency?.toUpperCase() || 'CHF';
if (currency && !isValidCurrencyCode(inputCurrency)) {
throw error(400, 'Invalid currency code');
}
// Validate personal + equal split method
if (splitMethod === 'personal_equal' && splits) {
const totalPersonal = splits.reduce((sum: number, split: any) => {
@@ -67,30 +74,66 @@ export const POST: RequestHandler = async ({ request, locals }) => {
}
}
const paymentDate = date ? new Date(date) : new Date();
let finalAmount = amount;
let originalAmount: number | undefined;
let exchangeRate: number | undefined;
// Convert currency if not CHF
if (inputCurrency !== 'CHF') {
try {
const conversion = await convertToCHF(amount, inputCurrency, paymentDate.toISOString());
finalAmount = conversion.convertedAmount;
originalAmount = amount;
exchangeRate = conversion.exchangeRate;
} catch (e) {
console.error('Currency conversion error:', e);
throw error(400, `Failed to convert ${inputCurrency} to CHF: ${e.message}`);
}
}
await dbConnect();
try {
const payment = await Payment.create({
title,
description,
amount,
currency: 'CHF',
amount: finalAmount,
currency: inputCurrency,
originalAmount,
exchangeRate,
paidBy,
date: date ? new Date(date) : new Date(),
date: paymentDate,
image,
category: category || 'groceries',
splitMethod,
createdBy: auth.user.nickname
});
const splitPromises = splits.map((split: any) => {
return PaymentSplit.create({
// Convert split amounts to CHF if needed
const convertedSplits = splits.map((split: any) => {
let convertedAmount = split.amount;
let convertedPersonalAmount = split.personalAmount;
// Convert amounts if we have a foreign currency
if (inputCurrency !== 'CHF' && exchangeRate) {
convertedAmount = split.amount * exchangeRate;
if (split.personalAmount) {
convertedPersonalAmount = split.personalAmount * exchangeRate;
}
}
return {
paymentId: payment._id,
username: split.username,
amount: split.amount,
amount: convertedAmount,
proportion: split.proportion,
personalAmount: split.personalAmount
});
personalAmount: convertedPersonalAmount
};
});
const splitPromises = convertedSplits.map((split) => {
return PaymentSplit.create(split);
});
await Promise.all(splitPromises);
@@ -104,6 +147,6 @@ export const POST: RequestHandler = async ({ request, locals }) => {
console.error('Error creating payment:', e);
throw error(500, 'Failed to create payment');
} finally {
await dbDisconnect();
// Connection will be reused
}
};

8
src/routes/api/cospend/payments/[id]/+server.ts
View File

@@ -1,7 +1,7 @@
import type { RequestHandler } from '@sveltejs/kit';
import { Payment } from '../../../../../models/Payment';
import { PaymentSplit } from '../../../../../models/PaymentSplit';
import { dbConnect, dbDisconnect } from '../../../../../utils/db';
import { dbConnect } from '../../../../../utils/db';
import { error, json } from '@sveltejs/kit';
export const GET: RequestHandler = async ({ params, locals }) => {
@@ -26,7 +26,7 @@ export const GET: RequestHandler = async ({ params, locals }) => {
if (e.status === 404) throw e;
throw error(500, 'Failed to fetch payment');
} finally {
await dbDisconnect();
// Connection will be reused
}
};
@@ -88,7 +88,7 @@ export const PUT: RequestHandler = async ({ params, request, locals }) => {
if (e.status) throw e;
throw error(500, 'Failed to update payment');
} finally {
await dbDisconnect();
// Connection will be reused
}
};
@@ -121,6 +121,6 @@ export const DELETE: RequestHandler = async ({ params, locals }) => {
if (e.status) throw e;
throw error(500, 'Failed to delete payment');
} finally {
await dbDisconnect();
// Connection will be reused
}
};

6
src/routes/api/cospend/recurring-payments/+server.ts
View File

@@ -1,6 +1,6 @@
import type { RequestHandler } from '@sveltejs/kit';
import { RecurringPayment } from '../../../../models/RecurringPayment';
import { dbConnect, dbDisconnect } from '../../../../utils/db';
import { dbConnect } from '../../../../utils/db';
import { error, json } from '@sveltejs/kit';
import { calculateNextExecutionDate, validateCronExpression } from '../../../../lib/utils/recurring';
@@ -33,7 +33,7 @@ export const GET: RequestHandler = async ({ locals, url }) => {
console.error('Error fetching recurring payments:', e);
throw error(500, 'Failed to fetch recurring payments');
} finally {
await dbDisconnect();
// Connection will be reused
}
};
@@ -134,6 +134,6 @@ export const POST: RequestHandler = async ({ request, locals }) => {
console.error('Error creating recurring payment:', e);
throw error(500, 'Failed to create recurring payment');
} finally {
await dbDisconnect();
// Connection will be reused
}
};

8
src/routes/api/cospend/recurring-payments/[id]/+server.ts
View File

@@ -1,6 +1,6 @@
import type { RequestHandler } from '@sveltejs/kit';
import { RecurringPayment } from '../../../../../models/RecurringPayment';
import { dbConnect, dbDisconnect } from '../../../../../utils/db';
import { dbConnect } from '../../../../../utils/db';
import { error, json } from '@sveltejs/kit';
import { calculateNextExecutionDate, validateCronExpression } from '../../../../../lib/utils/recurring';
import mongoose from 'mongoose';
@@ -30,7 +30,7 @@ export const GET: RequestHandler = async ({ params, locals }) => {
console.error('Error fetching recurring payment:', e);
throw error(500, 'Failed to fetch recurring payment');
} finally {
await dbDisconnect();
// Connection will be reused
}
};
@@ -149,7 +149,7 @@ export const PUT: RequestHandler = async ({ params, request, locals }) => {
}
throw error(500, 'Failed to update recurring payment');
} finally {
await dbDisconnect();
// Connection will be reused
}
};
@@ -179,6 +179,6 @@ export const DELETE: RequestHandler = async ({ params, locals }) => {
console.error('Error deleting recurring payment:', e);
throw error(500, 'Failed to delete recurring payment');
} finally {
await dbDisconnect();
// Connection will be reused
}
};

4
src/routes/api/cospend/recurring-payments/cron-execute/+server.ts
View File

@@ -2,7 +2,7 @@ import type { RequestHandler } from '@sveltejs/kit';
import { RecurringPayment } from '../../../../../models/RecurringPayment';
import { Payment } from '../../../../../models/Payment';
import { PaymentSplit } from '../../../../../models/PaymentSplit';
import { dbConnect, dbDisconnect } from '../../../../../utils/db';
import { dbConnect } from '../../../../../utils/db';
import { error, json } from '@sveltejs/kit';
import { calculateNextExecutionDate } from '../../../../../lib/utils/recurring';
@@ -119,6 +119,6 @@ export const POST: RequestHandler = async ({ request }) => {
console.error('[Cron] Error executing recurring payments:', e);
throw error(500, 'Failed to execute recurring payments');
} finally {
await dbDisconnect();
// Connection will be reused
}
};

58
src/routes/api/cospend/recurring-payments/execute/+server.ts
View File

@@ -2,9 +2,10 @@ import type { RequestHandler } from '@sveltejs/kit';
import { RecurringPayment } from '../../../../../models/RecurringPayment';
import { Payment } from '../../../../../models/Payment';
import { PaymentSplit } from '../../../../../models/PaymentSplit';
import { dbConnect, dbDisconnect } from '../../../../../utils/db';
import { dbConnect } from '../../../../../utils/db';
import { error, json } from '@sveltejs/kit';
import { calculateNextExecutionDate } from '../../../../../lib/utils/recurring';
import { convertToCHF } from '../../../../../lib/utils/currency';
export const POST: RequestHandler = async ({ locals }) => {
const auth = await locals.auth();
@@ -32,12 +33,35 @@ export const POST: RequestHandler = async ({ locals }) => {
for (const recurringPayment of duePayments) {
try {
// Handle currency conversion for execution date
let finalAmount = recurringPayment.amount;
let originalAmount: number | undefined;
let exchangeRate: number | undefined;
if (recurringPayment.currency !== 'CHF') {
try {
const conversion = await convertToCHF(
recurringPayment.amount,
recurringPayment.currency,
now.toISOString()
);
finalAmount = conversion.convertedAmount;
originalAmount = recurringPayment.amount;
exchangeRate = conversion.exchangeRate;
} catch (conversionError) {
console.error(`Currency conversion failed for recurring payment ${recurringPayment._id}:`, conversionError);
// Continue with original amount if conversion fails
}
}
// Create the payment
const payment = await Payment.create({
title: recurringPayment.title,
description: recurringPayment.description,
amount: recurringPayment.amount,
amount: finalAmount,
currency: recurringPayment.currency,
originalAmount,
exchangeRate,
paidBy: recurringPayment.paidBy,
date: now,
category: recurringPayment.category,
@@ -45,15 +69,31 @@ export const POST: RequestHandler = async ({ locals }) => {
createdBy: recurringPayment.createdBy
});
// Create payment splits
const splitPromises = recurringPayment.splits.map((split) => {
return PaymentSplit.create({
// Convert split amounts to CHF if needed
const convertedSplits = recurringPayment.splits.map((split) => {
let convertedAmount = split.amount || 0;
let convertedPersonalAmount = split.personalAmount;
// Convert amounts if we have a foreign currency and exchange rate
if (recurringPayment.currency !== 'CHF' && exchangeRate && split.amount) {
convertedAmount = split.amount * exchangeRate;
if (split.personalAmount) {
convertedPersonalAmount = split.personalAmount * exchangeRate;
}
}
return {
paymentId: payment._id,
username: split.username,
amount: split.amount,
amount: convertedAmount,
proportion: split.proportion,
personalAmount: split.personalAmount
});
personalAmount: convertedPersonalAmount
};
});
// Create payment splits
const splitPromises = convertedSplits.map((split) => {
return PaymentSplit.create(split);
});
await Promise.all(splitPromises);
@@ -99,6 +139,6 @@ export const POST: RequestHandler = async ({ locals }) => {
console.error('Error executing recurring payments:', e);
throw error(500, 'Failed to execute recurring payments');
} finally {
await dbDisconnect();
// Connection will be reused
}
};