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

Added support for multiple newsletters in custom signup form (#18023)

Browse source 
refs https://github.com/TryGhost/Product/issues/3514

---------

Co-authored-by: Michael Barrett <mike182uk@gmail.com>
This commit is contained in:
Princi Vershwal 2023-09-08 15:39:44 +05:30 • committed by GitHub
parent b0662d2cf9
commit f663774cf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ghost/members-api/lib/repositories/MemberRepository.js
View file

@ -19,7 +19,7 @@ const messages = {
bulkActionRequiresFilter: 'Cannot perform {action} without a filter or all=true',
tierArchived: 'Cannot use archived Tiers',
invalidEmail: 'Invalid Email',
invalidNewsletterId: 'Cannot subscribe to invalid newsletter {id}'
invalidNewsletterId: 'Cannot subscribe to invalid newsletter {ids}'
};
/**
@ -284,13 +284,19 @@ module.exports = class MemberRepository {
//checks for custom signUp forms
if (memberData.newsletters && memberData.newsletters.length > 0) {
const savedNewsletter = await this._newslettersService.browse({filter: `id:'${memberData.newsletters[0].id}'`});
if (savedNewsletter.length === 0) {
throw new errors.BadRequestError({message: tpl(messages.invalidNewsletterId, {id: memberData.newsletters[0].id})});
}
if (savedNewsletter[0].status === 'archived') {
memberData.newsletters = [];
const newsletterIds = memberData.newsletters.map(newsletter => newsletter.id);
const newsletters = await this._newslettersService.browse({
filter: `id:[${newsletterIds}]`,
columns: ['id','status']
});
if (newsletters.length !== newsletterIds.length) {
const validNewsletterIds = newsletters.map(newsletter => newsletter.id);
const invalidIds = newsletterIds.filter(id => !validNewsletterIds.includes(id));
throw new errors.BadRequestError({message: tpl(messages.invalidNewsletterId, {ids: invalidIds})});
}
memberData.newsletters = newsletters
.filter(newsletter => newsletter.status === 'active')
.map(newsletter => ({id: newsletter.id}));
}
// Subscribe members to default newsletters

34
ghost/members-api/test/unit/lib/repositories/member.test.js
View file

@ -337,17 +337,27 @@ describe('MemberRepository', function () {
};
});
it('subscribes a member to a specified newsletter', async function () {
const newsletter = {
it('subscribes a member to the specified newsletters', async function () {
const newsletters = [{
id: 'abc123',
status: 'active'
};
},
{
id: 'def456',
status: 'active'
},
{
id: 'ghi789',
status: 'active'
}];
const newsletterIds = newsletters.map(newsletter => newsletter.id);
newslettersServiceStub.browse
.withArgs({
filter: `id:'${newsletter.id}'`
filter: `id:[${newsletterIds}]`,
columns: ['id', 'status']
})
.resolves([newsletter]);
.resolves(newsletters);
const repo = new MemberRepository({
Member: memberModelStub,
@ -364,14 +374,18 @@ describe('MemberRepository', function () {
email: 'jamie@example.com',
email_disabled: false,
newsletters: [
{id: newsletter.id}
{id: newsletters[0].id},
{id: newsletters[1].id},
{id: newsletters[2].id}
]
});
newslettersServiceStub.browse.calledOnce.should.be.true();
memberModelStub.add.calledOnce.should.be.true();
memberModelStub.add.args[0][0].newsletters.should.eql([
{id: newsletter.id}
{id: newsletters[0].id},
{id: newsletters[1].id},
{id: newsletters[2].id}
]);
});
@ -380,7 +394,8 @@ describe('MemberRepository', function () {
newslettersServiceStub.browse
.withArgs({
filter: `id:'${INVALID_NEWSLETTER_ID}'`
filter: `id:[${INVALID_NEWSLETTER_ID}]`,
columns: ['id', 'status']
})
.resolves([]);
@ -412,7 +427,8 @@ describe('MemberRepository', function () {
newslettersServiceStub.browse
.withArgs({
filter: `id:'${newsletter.id}'`
filter: `id:[${newsletter.id}]`,
columns: ['id', 'status']
})
.resolves([newsletter]);