Skip to content

The ordering catalogue keeps what the page goes on to read #775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sridharkalaibala merged 2 commits into from
Sep 15, 2026
Merged

The ordering catalogue keeps what the page goes on to read #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfdccc6
The ordering catalogue keeps what the page goes on to read
sridharkalaibala Sep 15, 2026
e8f3ff7
The catalogue whitelist has a name, so a test can run it
sridharkalaibala Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 103 additions & 61 deletions order/indexedDB.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,67 +1148,7 @@ async function fetchAndStoreBranch(branchId, redirect = true, options = {}) {

categories.forEach(category => {
category.items.forEach(item => {
/* Empty when there is no photograph, so the card can draw
the dish's icon instead of a grey placeholder. */
const imageSrc = (!item.img || String(item.img).trim() === "" || item.img === "item.svg") ? "" : String(item.img).trim();
const itemId = typeof item.id === "string"
? item.id
: (item.id?.$oid || item._id?.$oid || item._id || `${Date.now()}-${Math.random().toString(16).slice(2)}`);
products.push({
id: String(itemId),
name: item.name || "Unknown",
available_quantity: item.available_quantity || 0,
price: parseFloat(item.final_price) || 0,
discount_price: parseFloat(item.discount_price) || 0,
tax_price: parseFloat(item.tax_price) || 0,
img: imageSrc,
/* Kept so the page can filter by diet, sort by what
sells, and search a description - none of which
reached this bundle before, which is why /order had
no search while /menu had one. */
diet: item.diet || "",
description: item.description || "",
prep_minutes: Number(item.prep_minutes) || 0,
ordered_count: Number(item.ordered_count) || 0,
/* Every photo, the drawn icon for a dish with none,
and whether it is on right now - the same three
things the menu shows, so the two pages agree. */
photos: Array.isArray(item.photos) ? item.photos.filter(Boolean) : [],
icon: item.icon || "",
available: item.available !== false,
served_in: Array.isArray(item.served_in) ? item.served_in.filter(Boolean) : [],
/*
* WHAT IS ON THE PLATE, AND IT WAS BEING THROWN AWAY.
*
* This loop is the ordering bundle's whole catalogue:
* a field it does not NAME here never reaches the page,
* however correctly the server sent it. The server has
* been sending nutrition, the shop's own marks, the
* "made without" tags and the earned health claims
* since the dish-facts release, and all four stopped
* at this object literal.
*
* So on /order the dish sheet drew no numbers, no
* badges and no marks, and the "Good for" filter group
* had nothing to offer and hid itself - while /menu,
* which reads the same endpoint straight without a
* local store, showed all of it. Nothing failed and
* nothing was logged; the fields simply were not there.
*
* `claims` is computed on the server from the shop's
* own numbers and is never stored on a dish, so
* carrying it here cannot invent a badge - it can only
* deliver one the numbers already earned.
*/
nutrition: item.nutrition && typeof item.nutrition === "object" ? item.nutrition : {},
tags: Array.isArray(item.tags) ? item.tags : [],
marks: Array.isArray(item.marks) ? item.marks : [],
claims: Array.isArray(item.claims) ? item.claims : [],
/* Whether the kitchen said it can cook this one to
order. See api/src/utils/spice-level.js. */
spice_choice: item.spice_choice === true,
category_name: category.category_name
});
products.push(catalogueItem(item, category.category_name));
});
});

Expand Down Expand Up @@ -1820,6 +1760,108 @@ async function showCategory(category, element) {
* drawing the same dish: one rule, or they will eventually disagree and the
* sheet will sell what the card refused.
*/
/*
* ONE DISH, AS THE ORDERING PAGES KEEP IT.
*
* This is a WHITELIST, and that is the whole reason it has a name. A field it
* does not mention is dropped in silence however correctly the server sent it:
* no error, no log, and no failing test, because tests on a feature read the
* source of the feature and not the source of this.
*
* It has cost two features already. nutrition, tags, marks and claims were
* sent for three releases and stopped here, so /order drew no numbers, no
* badges and no marks while /menu - which reads the same endpoint without a
* local store - drew all of them. daily_price and price_set_on were read by
* waitingForTodaysPrice() and never once delivered to it, so a whole fish
* priced from the morning's market and last priced YESTERDAY was offered at
* yesterday's rate with an ordinary Add button.
*
* Lifted out of the fetch loop so it can be RUN rather than read: see
* tests/the-ordering-catalogue-keeps-what-it-reads.test.js, which drives this
* over a real payload and separately refuses any storefront field the bundle
* reads and this does not keep.
*/
function catalogueItem(item, categoryName) {
/* Empty when there is no photograph, so the card can draw
the dish's icon instead of a grey placeholder. */
const imageSrc = (!item.img || String(item.img).trim() === "" || item.img === "item.svg") ? "" : String(item.img).trim();
const itemId = typeof item.id === "string"
? item.id
: (item.id?.$oid || item._id?.$oid || item._id || `${Date.now()}-${Math.random().toString(16).slice(2)}`);
return {
id: String(itemId),
name: item.name || "Unknown",
available_quantity: item.available_quantity || 0,
price: parseFloat(item.final_price) || 0,
discount_price: parseFloat(item.discount_price) || 0,
tax_price: parseFloat(item.tax_price) || 0,
img: imageSrc,
/* Kept so the page can filter by diet, sort by what
sells, and search a description - none of which
reached this bundle before, which is why /order had
no search while /menu had one. */
diet: item.diet || "",
description: item.description || "",
prep_minutes: Number(item.prep_minutes) || 0,
ordered_count: Number(item.ordered_count) || 0,
/* Every photo, the drawn icon for a dish with none,
and whether it is on right now - the same three
things the menu shows, so the two pages agree. */
photos: Array.isArray(item.photos) ? item.photos.filter(Boolean) : [],
icon: item.icon || "",
available: item.available !== false,
served_in: Array.isArray(item.served_in) ? item.served_in.filter(Boolean) : [],
/*
* WHAT IS ON THE PLATE, AND IT WAS BEING THROWN AWAY.
*
* This loop is the ordering bundle's whole catalogue:
* a field it does not NAME here never reaches the page,
* however correctly the server sent it. The server has
* been sending nutrition, the shop's own marks, the
* "made without" tags and the earned health claims
* since the dish-facts release, and all four stopped
* at this object literal.
*
* So on /order the dish sheet drew no numbers, no
* badges and no marks, and the "Good for" filter group
* had nothing to offer and hid itself - while /menu,
* which reads the same endpoint straight without a
* local store, showed all of it. Nothing failed and
* nothing was logged; the fields simply were not there.
*
* `claims` is computed on the server from the shop's
* own numbers and is never stored on a dish, so
* carrying it here cannot invent a badge - it can only
* deliver one the numbers already earned.
*/
nutrition: item.nutrition && typeof item.nutrition === "object" ? item.nutrition : {},
tags: Array.isArray(item.tags) ? item.tags : [],
marks: Array.isArray(item.marks) ? item.marks : [],
claims: Array.isArray(item.claims) ? item.claims : [],
/* Whether the kitchen said it can cook this one to
order. See api/src/utils/spice-level.js. */
spice_choice: item.spice_choice === true,
/*
* PRICED FROM THE MORNING'S MARKET, and the day it was
* last done. Both, or neither is any use: the flag says
* the rate comes from the market and the date says
* whether anybody has entered today's.
*
* waitingForTodaysPrice() has read these since the
* daily-price release and never once received them,
* because this literal did not name them. So on /order
* a whole fish flagged daily and priced YESTERDAY was
* offered at yesterday's rate with an ordinary Add
* button, while /menu said "Market price" - the same
* asymmetry that hid the dish facts, and this one is
* about money.
*/
daily_price: item.daily_price === true,
price_set_on: item.price_set_on || "",
category_name: categoryName
};
}

function waitingForTodaysPrice(product) {
if (!product) return true;
if (product.daily_price === true && !pricedToday(product.price_set_on)) return true;
Expand Down
14 changes: 10 additions & 4 deletions tests/how-hot-the-customer-asks.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,18 +192,24 @@ test('the ordering catalogue keeps every fact the server sends it', () => {
const dishFacts = require(path.join(ROOT, 'api', 'src', 'utils', 'dish-facts.js'));
const src = fs.readFileSync(path.join(ROOT, 'order', 'indexedDB.js'), 'utf8');

const at = src.indexOf('products.push({');
const at = src.indexOf('function catalogueItem(');
assert.ok(at !== -1, 'the ordering catalogue is not built where this test thinks');
const block = src.slice(at, src.indexOf('});', at));
let depth = 0;
let end = src.indexOf('{', at);
for (; end < src.length; end += 1) {
if (src[end] === '{') depth += 1;
else if (src[end] === '}' && --depth === 0) break;
}
const block = src.slice(at, end + 1);

for (const field of Object.keys(dishFacts.factsFor({}))) {
assert.ok(
new RegExp('(^|\\s)' + field + ':').test(block),
new RegExp('[\\s{]' + field + ':').test(block),
'the ordering catalogue drops "' + field + '", so the page never sees it'
);
}
/* And the one this change adds, for the same reason. */
assert.ok(/(^|\s)spice_choice:/.test(block), 'the catalogue drops spice_choice');
assert.ok(/[\s{]spice_choice:/.test(block), 'the catalogue drops spice_choice');
});

test('a cart line is told whether its dish offers the choice', () => {
Expand Down
Loading
Loading