TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 05:37:34 +03:00
Code Issues Projects Releases Wiki Activity

Addes sort order support for imported members

Browse Source 
no issue

- Member's labels have to have sort_order assigned when added/edited. This was lacking from batched importer.
- Implementation is based on logic used in model's base - e484709e73/core/server/models/base/index.js (L81-L86)
This commit is contained in:
Nazar Gargol 2020-08-12 16:34:15 +12:00
parent e484709e73
commit 7d3f6e32ca
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/server/api/canary/members.js
View File

@ -686,14 +686,14 @@ const members = {
});
if (mergedLabels) {
mergedLabels.forEach((label) => {
mergedLabels.forEach((label, index) => {
const matchedLabel = allLabelModels.find(labelModel => labelModel.get('name') === label.name);
mappedMembersLabelsBatchAssociations.push({
id: ObjectId.generate(),
member_id: memberId,
label_id: matchedLabel.id,
sort_order: 0 //TODO: implementme
sort_order: index
});
});
}

27
test/regression/api/canary/admin/members_spec.js
View File

@ -266,6 +266,8 @@ describe('Members API', function () {
});
it('Can import CSV with minimum one field and labels', function () {
let importLabel;
return request
.post(localUtils.API.getApiQuery(`members/upload/`))
.field('labels', ['global-label-1', 'global-label-1'])
@ -282,12 +284,14 @@ describe('Members API', function () {
should.exist(jsonResponse.meta);
should.exist(jsonResponse.meta.stats);
should.exist(jsonResponse.meta.import_label);
jsonResponse.meta.stats.imported.count.should.equal(2);
jsonResponse.meta.stats.invalid.count.should.equal(0);
})
.then(() => {
importLabel = jsonResponse.meta.import_label.slug;
return request
.get(localUtils.API.getApiQuery(`members/?search=${encodeURIComponent('member+labels_1@example.com')}`))
.get(localUtils.API.getApiQuery(`members/?&filter=label:${importLabel}`))
.set('Origin', config.get('url'))
.expect('Content-Type', /json/)
.expect('Cache-Control', testUtils.cacheRules.private)
@ -299,7 +303,7 @@ describe('Members API', function () {
should.exist(jsonResponse);
should.exist(jsonResponse.members);
should.exist(jsonResponse.members[0]);
should.equal(jsonResponse.members.length, 2);
const importedMember1 = jsonResponse.members[0];
should(importedMember1.email).equal('member+labels_1@example.com');
@ -309,8 +313,21 @@ describe('Members API', function () {
importedMember1.comped.should.equal(false);
importedMember1.stripe.should.not.be.undefined();
importedMember1.stripe.subscriptions.length.should.equal(0);
// 2 specified labels plus auto-generated import label
// check label order
// 1 unique global + 1 record labels + auto-generated import label
importedMember1.labels.length.should.equal(3);
importedMember1.labels[0].slug.should.equal('label');
importedMember1.labels[1].slug.should.equal('global-label-1');
importedMember1.labels[2].slug.should.equal(importLabel);
const importedMember2 = jsonResponse.members[1];
// 1 unique global + 2 record labels + auto-generated import label
importedMember2.labels.length.should.equal(4);
importedMember2.labels[0].slug.should.equal('another-label');
importedMember2.labels[1].slug.should.equal('and-one-more');
importedMember2.labels[2].slug.should.equal('global-label-1');
importedMember2.labels[3].slug.should.equal(importLabel);
});
});