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

Add bulk pricing retrieval for products in region: Implement getAllProductPricesInRegion method in FalukantService, update FalukantController and router to support new endpoint, and modify BranchView to utilize bulk request for improved performance.

Browse Source
This commit is contained in:
Torsten Schulz (local)
2026-01-28 15:18:26 +01:00
parent 8837494a06
commit 8550bd31d9
4 changed files with 126 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
backend/services/falukantService.js
View File

@@ -566,7 +566,13 @@ class FalukantService extends BaseService {
}
async getBranches(hashedUserId) {
const startTime = Date.now();
console.log(`[getBranches] Start für userId: ${hashedUserId}`);
const u = await getFalukantUserOrFail(hashedUserId);
const userTime = Date.now();
console.log(`[getBranches] User geladen in ${userTime - startTime}ms`);
const bs = await Branch.findAll({
where: { falukantUserId: u.id },
include: [
@@ -591,6 +597,8 @@ class FalukantService extends BaseService {
attributes: ['id', 'regionId'],
order: [['branchTypeId', 'ASC']]
});
const branchesTime = Date.now();
console.log(`[getBranches] Branches geladen (${bs.length} Stück) in ${branchesTime - userTime}ms`);
// Lade Wetter explizit für alle Regionen, um sicherzustellen, dass es korrekt geladen wird
const regionIds = [...new Set(bs.map(b => b.regionId))];
@@ -601,8 +609,10 @@ class FalukantService extends BaseService {
]
});
const weatherMap = new Map(weathers.map(w => [w.regionId, w.weatherType?.tr || null]));
const weatherTime = Date.now();
console.log(`[getBranches] Weather geladen in ${weatherTime - branchesTime}ms`);
return bs.map(b => {
const result = bs.map(b => {
const branchJson = b.toJSON();
// Verwende das explizit geladene Wetter, falls vorhanden, sonst das aus der Include-Beziehung
const weather = weatherMap.get(b.regionId) || branchJson.region?.weather?.weatherType?.tr || null;
@@ -612,6 +622,11 @@ class FalukantService extends BaseService {
weather: weather
};
});
const totalTime = Date.now() - startTime;
console.log(`[getBranches] Gesamtzeit: ${totalTime}ms für ${result.length} Branches`);
return result;
}
async createBranch(hashedUserId, cityId, branchTypeId) {
@@ -4217,6 +4232,74 @@ 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`);
// 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 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 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);
throw error;
}
}
async getProductPricesInCities(hashedUserId, productId, currentPrice, currentRegionId = null) {
const user = await this.getFalukantUserByHashedId(hashedUserId);
const character = await FalukantCharacter.findOne({ where: { userId: user.id } });