Skip to content

Refactor(src/database/mongo/sorted/add.js): reduce complexity in sortedSetsAdd() #178

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

Open
caoerz-helen wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Refactor(src/database/mongo/sorted/add.js): reduce complexity in sortedSetsAdd() #178

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f948ad1
Add a helpful function for sortedSetsAdd
zh000-star Jan 24, 2026
2c0a1e6
Find the smells and want to change sortedSetsAdd
zh000-star Jan 24, 2026
377f819
Add a helper function for sortedSetsAdd
zh000-star Jan 24, 2026
498bdb2
Changed sortedSetsAdd and fixed the smell and passed the test
zh000-star Jan 24, 2026
4f833d3
Add print statement to sortedSetsAdd
zh000-star Jan 24, 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
72 changes: 23 additions & 49 deletions src/database/mongo/sorted/add.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,72 +4,42 @@ module.exports = function (module) {
const helpers = require('../helpers');
const utils = require('../../../utils');

module.sortedSetAdd = async function (key, score, value) {
if (!key) {
return;
}
if (Array.isArray(score) && Array.isArray(value)) {
return await sortedSetAddBulk(key, score, value);
}
if (!utils.isNumber(score)) {
throw new Error(`[[error:invalid-score, ${score}]]`);
}
value = helpers.valueToString(value);

try {
await module.client.collection('objects').updateOne({ _key: key, value: value }, { $set: { score: parseFloat(score) } }, { upsert: true });
} catch (err) {
if (err && err.message.includes('E11000 duplicate key error')) {
console.log(new Error('e11000').stack, key, score, value);
return await module.sortedSetAdd(key, score, value);
function normalizeScores(keys, scores) {
const isArray = Array.isArray(scores);
if (!isArray) {
if (!utils.isNumber(scores)) {
throw new Error(`[[error:invalid-score, ${scores}]]`);
}
throw err;
return { isArrayOfScores: false, scores };
}
};

async function sortedSetAddBulk(key, scores, values) {
if (!scores.length || !values.length) {
return;
}
if (scores.length !== values.length) {
if (scores.length !== keys.length) {
throw new Error('[[error:invalid-data]]');
}
for (let i = 0; i < scores.length; i += 1) {
if (!utils.isNumber(scores[i])) {
throw new Error(`[[error:invalid-score, ${scores[i]}]]`);
}
}
values = values.map(helpers.valueToString);

const bulk = module.client.collection('objects').initializeUnorderedBulkOp();
for (let i = 0; i < scores.length; i += 1) {
bulk.find({ _key: key, value: values[i] }).upsert().updateOne({ $set: { score: parseFloat(scores[i]) } });
if (!scores.every(utils.isNumber)) {
throw new Error(`[[error:invalid-score, ${scores}]]`);
}
await bulk.execute();

return { isArrayOfScores: true, scores };
}

module.sortedSetsAdd = async function (keys, scores, value) {
console.log('HELEN sortedSetsAdd hit');
if (!Array.isArray(keys) || !keys.length) {
return;
}
const isArrayOfScores = Array.isArray(scores);
if ((!isArrayOfScores && !utils.isNumber(scores)) ||
(isArrayOfScores && scores.map(s => utils.isNumber(s)).includes(false))) {
throw new Error(`[[error:invalid-score, ${scores}]]`);
}

if (isArrayOfScores && scores.length !== keys.length) {
throw new Error('[[error:invalid-data]]');
}

const { isArrayOfScores, scores: normalizedScores } = normalizeScores(keys, scores);
value = helpers.valueToString(value);

const bulk = module.client.collection('objects').initializeUnorderedBulkOp();
for (let i = 0; i < keys.length; i += 1) {
const score = isArrayOfScores ? normalizedScores[i] : normalizedScores;
bulk
.find({ _key: keys[i], value: value })
.upsert()
.updateOne({ $set: { score: parseFloat(isArrayOfScores ? scores[i] : scores) } });
.updateOne({ $set: { score: parseFloat(score) } });
}
await bulk.execute();
};
Expand All @@ -78,13 +48,17 @@ module.exports = function (module) {
if (!Array.isArray(data) || !data.length) {
return;
}

const bulk = module.client.collection('objects').initializeUnorderedBulkOp();
data.forEach((item) => {
for (const item of data) {
if (!utils.isNumber(item[1])) {
throw new Error(`[[error:invalid-score, ${item[1]}]]`);
}
bulk.find({ _key: item[0], value: String(item[2]) }).upsert().updateOne({ $set: { score: parseFloat(item[1]) } });
});
bulk
.find({ _key: item[0], value: String(item[2]) })
.upsert()
.updateOne({ $set: { score: parseFloat(item[1]) } });
}
await bulk.execute();
};
};
};