torsten/yourpart3
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor church career validation in FalukantService

Browse Source 
- Moved church career checks to a more logical position in the transaction flow.
- Improved error handling by ensuring character existence is validated before checking for church office.
- Cleaned up commented code for better readability and maintainability.
This commit is contained in:
Torsten Schulz (local)
2026-01-22 16:54:29 +01:00
parent 4f786cdcc3
commit bceef9777a
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
backend/services/falukantService.js
View File

@@ -1769,20 +1769,17 @@ class FalukantService extends BaseService {
return await sequelize.transaction(async (t) => {
const user = await getFalukantUserOrFail(hashedUserId, { transaction: t });
// Prüfe, ob User eine kirchliche Karriere hat (dann nur Direktoren können verkaufen)
const character = await FalukantCharacter.findOne({ where: { userId: user.id }, transaction: t });
if (character) {
const churchOffice = await ChurchOffice.findOne({ where: { characterId: character.id }, transaction: t });
if (churchOffice) {
throw new Error('churchCareerNoDirectTransactions');
}
}
const branch = await getBranchOrFail(user.id, branchId);
// Prüfe, ob User eine kirchliche Karriere hat (dann nur Direktoren können verkaufen)
const character = await FalukantCharacter.findOne({ where: { userId: user.id }, transaction: t });
if (!character) throw new Error('No character found for user');
const churchOffice = await ChurchOffice.findOne({ where: { characterId: character.id }, transaction: t });
if (churchOffice) {
throw new Error('churchCareerNoDirectTransactions');
}
const stocks = await FalukantStock.findAll({
where: { branchId: branch.id },
attributes: ['id'],
@@ -1880,15 +1877,6 @@ class FalukantService extends BaseService {
return await sequelize.transaction(async (t) => {
const falukantUser = await getFalukantUserOrFail(hashedUserId, { transaction: t });
// Prüfe, ob User eine kirchliche Karriere hat (dann nur Direktoren können verkaufen)
const character = await FalukantCharacter.findOne({ where: { userId: falukantUser.id }, transaction: t });
if (character) {
const churchOffice = await ChurchOffice.findOne({ where: { characterId: character.id }, transaction: t });
if (churchOffice) {
throw new Error('churchCareerNoDirectTransactions');
}
}
const branch = await Branch.findOne({
where: { id: branchId, falukantUserId: falukantUser.id },
include: [{ model: FalukantStock, as: 'stocks' }],
@@ -1896,8 +1884,15 @@ class FalukantService extends BaseService {
});
if (!branch) throw new Error('Branch not found');
const stockIds = branch.stocks.map(s => s.id);
// Prüfe, ob User eine kirchliche Karriere hat (dann nur Direktoren können verkaufen)
const character = await FalukantCharacter.findOne({ where: { userId: falukantUser.id }, transaction: t });
if (!character) throw new Error('No character for user');
const churchOffice = await ChurchOffice.findOne({ where: { characterId: character.id }, transaction: t });
if (churchOffice) {
throw new Error('churchCareerNoDirectTransactions');
}
const inventory = await Inventory.findAll({
where: { stockId: stockIds },
include: [