From bd36353ee6d19a94dbd144a277476f72103b0cd7 Mon Sep 17 00:00:00 2001 From: junjiequan Date: Thu, 22 Jan 2026 14:43:02 +0100 Subject: [PATCH 1/2] fix: update instrument ID fetching to use encoded filter string --- .../consumerCallbacks/upsertProposalInScicat.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/queue/consumers/scicat/scicatProposal/consumerCallbacks/upsertProposalInScicat.ts b/src/queue/consumers/scicat/scicatProposal/consumerCallbacks/upsertProposalInScicat.ts index 5d3f300..0e1d5ad 100644 --- a/src/queue/consumers/scicat/scicatProposal/consumerCallbacks/upsertProposalInScicat.ts +++ b/src/queue/consumers/scicat/scicatProposal/consumerCallbacks/upsertProposalInScicat.ts @@ -200,8 +200,13 @@ const getInstrumentIds = async (instruments: Instrument[]) => { const instrumentIds = []; for (const name of instrumentNames) { - const instrumentNameLowerCase = encodeURIComponent(name.toLowerCase()); - const url = `${sciCatBaseUrl}/Instruments?filter={"where":{"name":{"ilike":"${instrumentNameLowerCase}"}}}`; + const instrumentNameLowerCase = name.toLowerCase(); + + const filterString = JSON.stringify({ + where: { name: { ilike: instrumentNameLowerCase } }, + }); + + const url = `${sciCatBaseUrl}/Instruments?filter=${encodeURIComponent(filterString)}`; try { const res = await request(url, { From 17c46585e007152b18d68243d2fd546435664b12 Mon Sep 17 00:00:00 2001 From: junjiequan Date: Thu, 22 Jan 2026 15:09:59 +0100 Subject: [PATCH 2/2] fix failing test --- .../consumerCallbacks/proposalFoldersCreation.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/queue/consumers/scicat/scicatProposal/consumerCallbacks/proposalFoldersCreation.spec.ts b/src/queue/consumers/scicat/scicatProposal/consumerCallbacks/proposalFoldersCreation.spec.ts index 28ade26..8c5d6f4 100644 --- a/src/queue/consumers/scicat/scicatProposal/consumerCallbacks/proposalFoldersCreation.spec.ts +++ b/src/queue/consumers/scicat/scicatProposal/consumerCallbacks/proposalFoldersCreation.spec.ts @@ -85,7 +85,7 @@ describe('proposalFoldersCreation', () => { expect(exec).toHaveBeenCalledTimes(1); expect(exec).toHaveBeenCalledWith( - 'command shortcode 2025 shortCode group_prefix_shortCode test.proposer@email.com test.member@email.com', + 'command shortcode 2026 shortCode group_prefix_shortCode test.proposer@email.com test.member@email.com', expect.any(Function) ); });