krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix XML Data Export Error by Modifying XML Format (#13942)

Browse Source 
* Added XML code to parse json + convert formatting before exporting as XML + XML Marshall tests

* Add linting fixes

linting errors still present in xmlMarshaller.test.js but, certain keys starting with digits (for example '800ed0') must be enclosed in quotes , so to maintain consistency within the test file I kept all keys enclosed by single quotes.

* fix(lint): unquote, EOF

Co-authored-by: SabreCat <sabe@habitica.com>
This commit is contained in:
John Li
2022-05-12 16:24:17 -04:00
committed by GitHub
parent 761d70ec55
commit d132b057eb
2 changed files with 133 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
test/api/unit/libs/xmlMarshaller.test.js
View File

@@ -42,3 +42,109 @@ describe('xml marshaller marshalls user data', () => {
</user>`);
});
});
describe('xml marshaller marshalls user data (with purchases)', () => {
const minimumUser = {
pinnedItems: [],
unpinnedItems: [],
inbox: {},
};
function userDataWith (fields) {
return { ...minimumUser, ...fields };
}
it('maps the purchases field with data that begins with a number', () => {
const userData = userDataWith({
purchased: {
ads: false,
txnCount: 0,
skin: {
eb052b: true,
'0ff591': true,
'2b43f6': true,
d7a9f7: true,
'800ed0': true,
rainbow: true,
},
},
});
const xml = xmlMarshaller.marshallUserData(userData);
expect(xml).to.equal(`<user>
<inbox/>
<purchased>
<ads>false</ads>
<txnCount>0</txnCount>
<skin>eb052b</skin>
<skin>0ff591</skin>
<skin>2b43f6</skin>
<skin>d7a9f7</skin>
<skin>800ed0</skin>
<skin>rainbow</skin>
</purchased>
</user>`);
});
});
describe('xml marshaller marshalls user data (with purchases nested)', () => {
const minimumUser = {
pinnedItems: [],
unpinnedItems: [],
inbox: {},
};
function userDataWith (fields) {
return { ...minimumUser, ...fields };
}
it('maps the purchases field with data that begins with a number and nested objects', () => {
const userData = userDataWith({
purchased: {
ads: false,
txnCount: 0,
skin: {
eb052b: true,
'0ff591': true,
'2b43f6': true,
d7a9f7: true,
'800ed0': true,
rainbow: true,
},
plan: {
consecutive: {
count: 0,
offset: 0,
gemCapExtra: 0,
trinkets: 0,
},
},
},
});
const xml = xmlMarshaller.marshallUserData(userData);
expect(xml).to.equal(`<user>
<inbox/>
<purchased>
<ads>false</ads>
<txnCount>0</txnCount>
<skin>eb052b</skin>
<skin>0ff591</skin>
<skin>2b43f6</skin>
<skin>d7a9f7</skin>
<skin>800ed0</skin>
<skin>rainbow</skin>
<plan>
<item>
<count>0</count>
<offset>0</offset>
<gemCapExtra>0</gemCapExtra>
<trinkets>0</trinkets>
</item>
</plan>
</purchased>
</user>`);
});
});

28
website/server/libs/xmlMarshaller.js
View File

@@ -23,7 +23,33 @@ export function marshallUserData (userData) {
type: i.type,
}));
return js2xml.parse('user', userData, {
const copyUserData = JSON.parse(JSON.stringify(userData));
const newPurchased = {};
if (userData.purchased != null) {
for (const itemType in userData.purchased) {
if (userData.purchased[itemType] != null) {
if (typeof userData.purchased[itemType] === 'object') {
const fixedData = [];
for (const item in userData.purchased[itemType]) {
if (item != null) {
if (typeof userData.purchased[itemType][item] === 'object') {
fixedData.push({ item: userData.purchased[itemType][item] });
} else {
fixedData.push(item);
}
}
}
newPurchased[itemType] = fixedData;
} else {
newPurchased[itemType] = userData.purchased[itemType];
}
}
}
copyUserData.purchased = newPurchased;
}
return js2xml.parse('user', copyUserData, {
cdataInvalidChars: true,
replaceInvalidChars: true,
declaration: {