Skip to content

A local-first personal finance app

Fix account properties being overriden with empty values from metadata (#5115)

Rob Jackson180431f9ed82
diff --git a/packages/sync-server/src/app-gocardless/services/gocardless-service.js b/packages/sync-server/src/app-gocardless/services/gocardless-service.js
index 28d36f1e35..65fc2c9266 100644
--- a/packages/sync-server/src/app-gocardless/services/gocardless-service.js
+++ b/packages/sync-server/src/app-gocardless/services/gocardless-service.js
@@ -426,10 +426,19 @@ export const goCardlessService = {
handleGoCardlessError(error);
}
- return {
- ...detailedAccount.account,
- ...metadataAccount,
- };
+ // Some banks provide additional data in both fields, but can do yucky things like have an empty
+ // string in one place but not the other. We'll fix this by merging the two objects, but preferring truthy values
+ // from the metadata object over the details object.
+ const mergedAccount = {};
+ const uniqueKeys = new Set([
+ ...Object.keys(detailedAccount.account),
+ ...Object.keys(metadataAccount),
+ ]);
+ for (const key of uniqueKeys) {
+ mergedAccount[key] = metadataAccount[key] || detailedAccount.account[key];
+ }
+
+ return mergedAccount;
},
/**
diff --git a/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js b/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js
index 92c0d941e1..5f75812331 100644
--- a/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js
+++ b/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js
@@ -300,6 +300,27 @@ describe('goCardlessService', () => {
expect(getDetailsSpy).toBeCalledTimes(1);
expect(getMetadataSpy).toBeCalledTimes(1);
});
+
+ it('metadata does not overwrite values from details with empty values', async () => {
+ getDetailsSpy.mockResolvedValue({
+ ...mockAccountDetails,
+ account: {
+ ...mockAccountDetails.account,
+ name: 'An Actual Account Name',
+ },
+ });
+
+ getMetadataSpy.mockResolvedValue({
+ ...mockAccountMetaData,
+ name: '',
+ });
+
+ expect(await goCardlessService.getDetailedAccount(accountId)).toEqual({
+ ...mockAccountMetaData,
+ ...mockAccountDetails.account,
+ name: 'An Actual Account Name',
+ });
+ });
});
describe('#getInstitutions', () => {
diff --git a/upcoming-release-notes/5115.md b/upcoming-release-notes/5115.md
new file mode 100644
index 0000000000..616d57e6f7
--- /dev/null
+++ b/upcoming-release-notes/5115.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [rjackson]
+---
+
+Fix account properties being overriden with empty values from metadata