Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

Made a single request for products in theme middleware

Browse source 
refs https://github.com/TryGhost/Team/issues/907

The logic to populate the `@price` data and the `@products` data both
rely on the same product data, but were each making their own request to
the API. This refactor removes the request from the legacy `@price`
data, which should cut the database queries in half.
This commit is contained in:
Fabien O'Carroll 2021-07-21 11:28:13 +01:00
parent f900b4ee78
commit 49f48c0f09
1 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
core/frontend/services/theme-engine/middleware.js
View file

@ -36,12 +36,7 @@ function ensureActiveTheme(req, res, next) {
next();
}
/*
* @TODO
* This should be definitely refactored and we need to consider _some_
* members settings as publicly readable
*/
async function haxGetMembersPriceData() {
function calculateLegacyPriceData(products) {
const defaultPrice = {
amount: 0,
currency: 'usd',
@ -63,31 +58,19 @@ async function haxGetMembersPriceData() {
};
}
try {
const {products} = await api.canary.products.browse({
include: ['monthly_price','yearly_price']
});
const defaultProduct = products[0] || {};
const defaultProduct = products[0];
const monthlyPrice = makePriceObject(defaultProduct.monthly_price || defaultPrice);
const monthlyPrice = makePriceObject(defaultProduct.monthly_price || defaultPrice);
const yearlyPrice = makePriceObject(defaultProduct.yearly_price || defaultPrice);
const yearlyPrice = makePriceObject(defaultProduct.yearly_price || defaultPrice);
const priceData = {
monthly: monthlyPrice,
yearly: yearlyPrice,
currency: monthlyPrice ? monthlyPrice.currency : defaultPrice.currency
};
const priceData = {
monthly: monthlyPrice,
yearly: yearlyPrice,
currency: monthlyPrice ? monthlyPrice.currency : defaultPrice.currency
};
return priceData;
} catch (err) {
return {
monthly: makePriceObject(defaultPrice),
yearly: makePriceObject(defaultPrice),
currency: 'usd'
};
}
return priceData;
}
async function getProductAndPricesData() {
@ -131,8 +114,8 @@ async function updateGlobalTemplateOptions(req, res, next) {
posts_per_page: activeTheme.get().config('posts_per_page'),
image_sizes: activeTheme.get().config('image_sizes')
};
const priceData = await haxGetMembersPriceData();
const productData = await getProductAndPricesData();
const priceData = calculateLegacyPriceData(productData);
let products = null;
let product = null;