Claudia/PluralFlux-infra
1
1
Fork 0
forked from PluralFlux/PluralFlux
Code Pull Requests Actions Packages Releases Activity

refactored async/await for import helper to not also use then/catch

Browse Source
This commit is contained in:
Aster Fialla
2026-02-24 12:39:37 -05:00
parent 123aabf650
commit 971638bfe3
2 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/helpers/importHelper.js
View File

@@ -9,35 +9,51 @@ const ih = {};
* @async * @async
* @param {string} authorId - The author of the message * @param {string} authorId - The author of the message
* @param {string | null} [attachmentUrl] - The attached JSON url. * @param {string | null} [attachmentUrl] - The attached JSON url.
* @returns {string} A successful addition of all members. * @returns {Promise<string>} A successful addition of all members.
* @throws {Error} When the member exists, or creating a member doesn't work. * @throws {Error} When the member exists, or creating a member doesn't work.
*/ */
ih.pluralKitImport = async function (authorId, attachmentUrl= null) { ih.pluralKitImport = async function (authorId, attachmentUrl= null) {
let fetchResult, pkData;
if (!attachmentUrl) { if (!attachmentUrl) {
throw new Error(enums.err.NOT_JSON_FILE); throw new Error(enums.err.NOT_JSON_FILE);
} }
return fetch(attachmentUrl).then((res) => res.json()).then(async(pkData) => { try {
const pkMembers = pkData.members; fetchResult = await fetch(attachmentUrl);
let errors = []; }
const addedMembers = []; catch(e) {
for (let pkMember of pkMembers) { throw new Error(enums.err.CANNOT_FETCH_RESOURCE, { cause: e });
const proxy = pkMember.proxy_tags[0] ? `${pkMember.proxy_tags[0].prefix ?? ''}text${pkMember.proxy_tags[0].suffix ?? ''}` : null; }
await memberHelper.addFullMember(authorId, pkMember.name, pkMember.display_name, proxy, pkMember.avatar_url).then((memberObj) => {
addedMembers.push(memberObj.member.name); try {
if (memberObj.errors.length > 0) { pkData = await fetchResult.json();
errors.push(`\n**${pkMember.name}:** `) }
errors = errors.concat(memberObj.errors); catch(e) {
} throw new Error(enums.err.NOT_JSON_FILE, { cause: e })
}).catch(e => { }
errors.push(e.message);
}); const pkMembers = pkData.members;
let errors = [];
let addedMembers = [];
for (let pkMember of pkMembers) {
const proxy = pkMember.proxy_tags[0] ? `${pkMember.proxy_tags[0].prefix ?? ''}text${pkMember.proxy_tags[0].suffix ?? ''}` : null;
try {
const memberObj = await memberHelper.addFullMember(authorId, pkMember.name, pkMember.display_name, proxy, pkMember.avatar_url);
addedMembers.push(memberObj.member.name);
if (memberObj.errors.length > 0) {
errors.push(`\n**${pkMember.name}:** `);
errors = errors.concat(memberObj.errors);
} }
const aggregatedText = addedMembers.length > 0 ? `Successfully added members: ${addedMembers.join(', ')}` : `${enums.err.NO_MEMBERS_IMPORTED}`; }
if (errors.length > 0) { catch(e) {
throw new AggregateError(errors, aggregatedText); console.error(e);
} errors.push(e);
return aggregatedText; }
}); }
const aggregatedText = addedMembers.length > 0 ? `Successfully added members: ${addedMembers.join(', ')}` : `${enums.err.NO_MEMBERS_IMPORTED}`;
if (errors.length > 0) {
throw new AggregateError(errors, aggregatedText);
}
return aggregatedText;
} }
export const importHelper = ih; export const importHelper = ih;

55
tests/helpers/importHelper.test.js
View File

@@ -50,45 +50,50 @@ describe('importHelper', () => {
describe('pluralKitImport', () => { describe('pluralKitImport', () => {
test('if no attachment URL, throws error', () => { test('if no attachment URL, throws error', async() => {
return importHelper.pluralKitImport(authorId).catch((e) => { await expect(importHelper.pluralKitImport(authorId)).rejects.toThrow(enums.err.NOT_JSON_FILE);
expect(e).toEqual(new Error(enums.err.NOT_JSON_FILE));
})
}) })
test('if attachment URL, calls fetch and addFullMember and returns value', () => { test('if attachment URL, calls fetch and addFullMember and returns value', async() => {
memberHelper.addFullMember.mockResolvedValue(mockAddReturn); memberHelper.addFullMember.mockResolvedValue(mockAddReturn);
return importHelper.pluralKitImport(authorId, attachmentUrl).then((res) => { const result = await importHelper.pluralKitImport(authorId, attachmentUrl);
expect(fetch).toHaveBeenCalledTimes(1);
expect(fetch).toHaveBeenCalledWith(attachmentUrl); expect(fetch).toHaveBeenCalledTimes(1);
expect(memberHelper.addFullMember).toHaveBeenCalledWith(authorId, mockImportedMember.name, mockImportedMember.display_name, 'SP{text}', mockImportedMember.avatar_url); expect(fetch).toHaveBeenCalledWith(attachmentUrl);
expect(res).toEqual(`Successfully added members: ${mockAddReturnMember.name}`) expect(memberHelper.addFullMember).toHaveBeenCalledWith(authorId, mockImportedMember.name, mockImportedMember.display_name, 'SP{text}', mockImportedMember.avatar_url);
}) expect(result).toEqual(`Successfully added members: ${mockAddReturnMember.name}`)
}) })
test('if addFullMember returns nothing, return correct enum', () => {
test('if fetch fails, throws error', async() => {
global.fetch = jest.fn().mockRejectedValue("can't get");
await expect(importHelper.pluralKitImport(authorId, attachmentUrl)).rejects.toThrow(enums.err.CANNOT_FETCH_RESOURCE, "can't get file");
})
test('if json conversion fails, throws error', async() => {
global.fetch = jest.fn().mockResolvedValue({
ok: true,
json: () => Promise.reject("not json")
})
await expect(importHelper.pluralKitImport(authorId, attachmentUrl)).rejects.toThrow(enums.err.NOT_JSON_FILE, "not json");
})
test('if addFullMember returns nothing, return correct enum', async () => {
memberHelper.addFullMember.mockResolvedValue(); memberHelper.addFullMember.mockResolvedValue();
return importHelper.pluralKitImport(authorId, attachmentUrl).catch((res) => { await expect(importHelper.pluralKitImport(authorId, attachmentUrl)).rejects.toThrow(([], enums.err.NO_MEMBERS_IMPORTED));
expect(res).toEqual(new AggregateError([], enums.err.NO_MEMBERS_IMPORTED));
})
}) })
test('if addFullMember returns nothing and throws error, catch and return error', () => { test('if addFullMember returns nothing and throws error, catch and return error', async() => {
memberHelper.addFullMember.mockResolvedValue(new Error('error')); memberHelper.addFullMember.mockResolvedValue(new Error('error'));
return importHelper.pluralKitImport(authorId, attachmentUrl).catch((res) => { await expect(importHelper.pluralKitImport(authorId, attachmentUrl)).rejects.toThrow(([new Error('error')], enums.err.NO_MEMBERS_IMPORTED));
expect(res).toEqual(new AggregateError([new Error('error')], enums.err.NO_MEMBERS_IMPORTED))
})
}) })
test('if addFullMember returns member but also contains error, return member and error', () => { test('if addFullMember returns member but also contains error, return member and error', async () => {
// Arrange // Arrange
const memberObj = {errors: ['error'], member: mockAddReturnMember}; const memberObj = {errors: ['error'], member: mockAddReturnMember};
memberHelper.addFullMember.mockResolvedValue(memberObj); memberHelper.addFullMember.mockResolvedValue(memberObj);
// Act // Act & Assert
return importHelper.pluralKitImport(authorId, attachmentUrl).catch((res) => { await expect(importHelper.pluralKitImport(authorId, attachmentUrl)).rejects.toThrow((['error'], `Successfully added members: ${mockAddReturnMember.name}`));
// Assert
expect(res).toEqual(new AggregateError(['error'], `Successfully added members: ${mockAddReturnMember.name}`))
})
}) })
}) })