Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00
Code Issues Activity

Refactored bulk insert/delete operations into separate module

Browse source 
no issue

- Moved bulk db operations outside of importer module to create clearer separation of responsibilities
This commit is contained in:
Nazar Gargol 2020-08-20 18:42:38 +12:00
parent 3a594ce22e
commit f8adb4a672
2 changed files with 50 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
core/server/services/members/importer/bulk-operations.js Normal file
View file

@ -0,0 +1,47 @@
const _ = require('lodash');
const db = require('../../../data/db');
const CHUNK_SIZE = 100;
async function insert(table, data) {
const result = {
successful: 0,
unsuccessful: 0,
errors: []
};
for (const chunk of _.chunk(data, CHUNK_SIZE)) {
try {
await db.knex(table).insert(chunk);
result.successful += chunk.length;
} catch (error) {
result.unsuccessful += chunk.length;
result.errors.push(error);
}
}
return result;
}
async function del(table, ids) {
const result = {
successful: 0,
unsuccessful: 0,
errors: []
};
for (const chunk of _.chunk(ids, CHUNK_SIZE)) {
try {
await db.knex(table).whereIn('id', chunk).del();
result.successful += chunk.length;
} catch (error) {
result.unsuccessful += chunk.length;
result.errors.push(error);
}
}
return result;
}
module.exports.insert = insert;
module.exports.del = del;

44
core/server/services/members/importer/index.js
View file

@ -4,14 +4,14 @@ const ObjectId = require('bson-objectid');
const moment = require('moment-timezone');
const errors = require('@tryghost/errors');
const membersService = require('../index');
const bulkOperations = require('./bulk-operations');
const models = require('../../../models');
const {i18n} = require('../../../lib/common');
const db = require('../../../data/db');
const logging = require('../../../../shared/logging');
const doImport = async ({members, allLabelModels, importSetLabels, createdBy}) => {
const createInserter = table => data => insert(db.knex, table, data);
const createDeleter = table => data => del(db.knex, table, data);
const createInserter = table => data => bulkOperations.insert(table, data);
const createDeleter = table => data => bulkOperations.del(table, data);
const deleteMembers = createDeleter('members');
const insertLabelAssociations = createInserter('members_labels');
@ -107,44 +107,6 @@ const doImport = async ({members, allLabelModels, importSetLabels, createdBy}) =
return result;
};
const CHUNK_SIZE = 100;
async function insert(knex, table, data) {
const result = {
successful: 0,
unsuccessful: 0,
errors: []
};
for (const chunk of _.chunk(data, CHUNK_SIZE)) {
try {
await knex(table).insert(chunk);
result.successful += chunk.length;
} catch (error) {
result.unsuccessful += chunk.length;
result.errors.push(error);
}
}
return result;
}
async function del(knex, table, ids) {
const result = {
successful: 0,
unsuccessful: 0,
errors: []
};
for (const chunk of _.chunk(ids, CHUNK_SIZE)) {
try {
await knex(table).whereIn('id', chunk).del();
result.successful += chunk.length;
} catch (error) {
result.unsuccessful += chunk.length;
result.errors.push(error);
}
}
return result;
}
function serializeMemberLabels(labels) {
return labels.reduce((labelsAcc, label) => {
if (!label) {