Skip to content

fix: update instrument ID fetching to use encoded filter string #633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Junjiequan merged 2 commits into from
Jan 22, 2026
Merged

fix: update instrument ID fetching to use encoded filter string #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd36353
fix: update instrument ID fetching to use encoded filter string
Junjiequan Jan 22, 2026
17c4658
fix failing test
Junjiequan Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/queue/consumers/scicat/scicatProposal/consumerCallbacks/proposalFoldersCreation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
});
Expand Down
9 changes: 7 additions & 2 deletions src/queue/consumers/scicat/scicatProposal/consumerCallbacks/upsertProposalInScicat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<InstrumentDto[]>(url, {
Expand Down