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

Add synchronous price calculation method: Introduce calcRegionalSellPriceSync for improved performance in price calculations when worthPercent is known. Refactor getAllProductPricesInRegion to utilize this new method, enhancing efficiency by reducing database calls. Update BranchView to manage product prices cache with regionId for better data handling.

Browse Source
This commit is contained in:
Torsten Schulz (local)
2026-01-29 15:06:38 +01:00
parent 474e46837a
commit 032e336b65
3 changed files with 30 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
backend/services/falukantService.js
View File

@@ -98,6 +98,15 @@ function calcSellPrice(product, knowledgeFactor = 0) {
return min + (max - min) * (knowledgeFactor / 100);
}
/** Synchrone Preisberechnung, wenn worthPercent bereits bekannt ist (kein DB-Zugriff). */
function calcRegionalSellPriceSync(product, knowledgeFactor, worthPercent) {
if (product.sellCost === null || product.sellCost === undefined) return null;
const basePrice = product.sellCost * (worthPercent / 100);
const min = basePrice * 0.6;
const max = basePrice;
return min + (max - min) * (knowledgeFactor / 100);
}
async function calcRegionalSellPrice(product, knowledgeFactor, regionId, worthPercent = null) {
// Wenn worthPercent nicht übergeben wurde, hole es aus der Datenbank
if (worthPercent === null) {
@@ -4394,66 +4403,34 @@ class FalukantService extends BaseService {
}
async getAllProductPricesInRegion(hashedUserId, regionId) {
const startTime = Date.now();
console.log(`[getAllProductPricesInRegion] Start für userId: ${hashedUserId}, regionId: ${regionId}`);
try {
const user = await this.getFalukantUserByHashedId(hashedUserId);
const userTime = Date.now();
console.log(`[getAllProductPricesInRegion] User geladen in ${userTime - startTime}ms`);
const character = await FalukantCharacter.findOne({ where: { userId: user.id } });
if (!character) {
throw new Error(`No FalukantCharacter found for user with id ${user.id}`);
}
const characterTime = Date.now();
console.log(`[getAllProductPricesInRegion] Character geladen in ${characterTime - userTime}ms`);
const [products, knowledges, townWorths] = await Promise.all([
ProductType.findAll({ attributes: ['id', 'sellCost'] }),
Knowledge.findAll({
where: { characterId: character.id },
attributes: ['productId', 'knowledge']
}),
TownProductWorth.findAll({
where: { regionId: regionId },
attributes: ['productId', 'worthPercent']
})
]);
// Lade alle Produkte auf einmal
const products = await ProductType.findAll({
attributes: ['id', 'sellCost']
});
const productsTime = Date.now();
console.log(`[getAllProductPricesInRegion] ${products.length} Produkte geladen in ${productsTime - characterTime}ms`);
// Lade alle Knowledge-Werte für diesen Character auf einmal
const knowledges = await Knowledge.findAll({
where: { characterId: character.id },
attributes: ['productId', 'knowledge']
});
const knowledgeMap = new Map(knowledges.map(k => [k.productId, k.knowledge || 0]));
const knowledgeTime = Date.now();
console.log(`[getAllProductPricesInRegion] ${knowledges.length} Knowledge-Werte geladen in ${knowledgeTime - productsTime}ms`);
// Lade alle TownProductWorth-Werte für diese Region auf einmal
const townWorths = await TownProductWorth.findAll({
where: { regionId: regionId },
attributes: ['productId', 'worthPercent']
});
const worthMap = new Map(townWorths.map(tw => [tw.productId, tw.worthPercent || 50]));
const worthTime = Date.now();
console.log(`[getAllProductPricesInRegion] ${townWorths.length} Worth-Werte geladen in ${worthTime - knowledgeTime}ms`);
// Berechne Preise für alle Produkte
const prices = {};
for (const product of products) {
if (product.sellCost === null || product.sellCost === undefined) {
continue; // Überspringe Produkte ohne sellCost
}
const worthPercent = worthMap.get(product.id) ?? 50;
const knowledgeFactor = knowledgeMap.get(product.id) || 0;
const worthPercent = worthMap.get(product.id) || 50;
// Verwende calcRegionalSellPrice mit bereits geladenem worthPercent
const price = await calcRegionalSellPrice(product, knowledgeFactor, regionId, worthPercent);
prices[product.id] = price;
const price = calcRegionalSellPriceSync(product, knowledgeFactor, worthPercent);
if (price !== null) prices[product.id] = price;
}
const calcTime = Date.now();
console.log(`[getAllProductPricesInRegion] Preise berechnet in ${calcTime - worthTime}ms`);
const totalTime = Date.now() - startTime;
console.log(`[getAllProductPricesInRegion] Gesamtzeit: ${totalTime}ms für ${Object.keys(prices).length} Produkte`);
return { prices };
} catch (error) {
console.error(`[getAllProductPricesInRegion] Error for regionId=${regionId}:`, error);