fix: bug for searching by proposal ID failing to find proposal due to whitespace by YufanKambang · Pull Request #1345 · UserOfficeProject/user-office-core

YufanKambang · 2026-02-09T15:44:47Z

Description

This pr is in response to the issue : UserOfficeProject/issue-tracker#1211

Motivation and Context

This is to improve user experience as well as to not cause confusion if they copied a proposal ID with a white space and see no proposals being shown

How Has This Been Tested

I have tested it using the localhost proposal portal, I first checked to see if the given proposal ID had a proposal in the system, when confirmed I tested it by adding whitespace to the start of the proposal ID, and the at the end of the ID.

Fixes

Changes

Depends on

Tests included/Docs Updated?

I have added tests to cover my changes.
All relevant doc has been updated

YufanKambang · 2026-02-10T08:57:11Z

Found a query function that is related to bug, I think making sure that the input string if considered to be proposal IDs should be trimmed/normalised/validated before being passed as a query parameter in search proposals function

YufanKambang · 2026-02-10T16:45:22Z

Found the function getProposalById(){} in three different locations, it was confusing.
This is where the query is happening: line 1036 of /apps/backend/src/datasources/postgres/ProposalDataSource.ts

However the getProposalById(){} here if of a higher level, as it includes the authorisation, and I think we should add the check and fix for the bug here

YufanKambang · 2026-02-11T16:27:08Z

Have made the fix, but yet to test it. Having issues with logging into office.localhost and user.localhost.

…earch

YufanKambang · 2026-02-12T16:52:53Z

Fixing my local set up of the ICD system to be able to test the code changes, and assess that it actually fixes the whitespace bug

…earch

mutambaraf

Just a some few comments and can we also have tests e2e to this bug or backend unit tests.

apps/backend/src/queries/ProposalQueries.ts

apps/backend/src/datasources/postgres/ProposalDataSource.ts

ellen-wright · 2026-02-17T10:40:07Z

apps/backend/src/queries/ProposalQueries.ts

Would be good if this change was done for the instrument scientist table too

I do not have the instrument scientist role. Is it the same as the experiment scientists?

I was looking into this and the way the proposal id get passed to be turned into a query is a bit different for instrument-scientist compared to user-officers. I think it would help to put this into a different issue, that I can pick up

I have made the update so that the instrument/experimental scientist table also does not get effected by whitespace. tested it on localhost using the role experimental scientist

For the roles user-officer, the searchText that they put into the search bar int he proposal tables is directly used for the view query.
However, for the role instrument-scientist the searchText is put into a filter class called ProposalsFilter, and this ProposalsFilter is passed into the method getInstrumentScientistProposals and so we have to update the ProposalsFilter.text field with the trimmed searchtext that the intrument/experimental scientist will input into the intrument/experimental scientist proposal tables.

…s://github.com/UserOfficeProject/user-office-core into 1211-bug-when-whitespace-in-proposal-id-search

YufanKambang · 2026-02-17T19:03:23Z

Fixing my local set up of the ICD system to be able to test the code changes, and assess that it actually fixes the whitespace bug

I have added a unit test for the role user-officer, for the whitespace bug.

YufanKambang · 2026-02-17T21:29:13Z

The unit test produced actually tests the wrong function that is being called, as we are not trying to get a proposal from the database, but to get filter the view from the user-officer table using the proposalId.

YufanKambang · 2026-02-17T21:34:15Z

I have tried to test this locally but I have failed facing an import error with muhammara.
I am pushing the test so that the github workflow can run it

YufanKambang · 2026-02-18T09:53:34Z

I also noticed no instructions on how to run unit and e2e tests locally on your work machine in user-office-core readme.md, or in the user office dev documentation. Updating this so that new developers to the repository will know how to run the tests.

…earch

apps/backend/src/queries/ProposalQueries.ts

yoganandaness · 2026-02-19T11:59:41Z

apps/backend/src/queries/ProposalQueries.ts

    first?: number,
    offset?: number
  ) {
+    const cleanText = filter?.text?.trim();


I would recommend trim to happen in datasource layer during sql query rather than the business logic layer here.

Let me know if you have any concerns

This one is I have not been able to successfully move it to the datasource layer

I placed console.logs but have not been able to see them in any container logs.

How should I be handling this object filter for the @Authorized([Roles.INSTRUMENT_SCIENTIST, Roles.INTERNAL_REVIEWER]) proposal view as they have a whole object that gets passed compared to the string for @Authorized([Roles.USER_OFFICER])?

This has now been fixed, the blocker was that the datasource layer that the fix was being applied to was the wrong one, it should have been StfcProposalDataSource.ts as that is the actual datasource layer being used for this proposal view.

…earch

YufanKambang · 2026-02-25T16:38:23Z

I have been unable to push these changes due to the pre-commit linter. That is the reason why I have snipped my code changes

…earch

investigation result, found query function related to bug

1f0f471

YufanKambang mentioned this pull request Feb 9, 2026

Searches with leading whitespace do not return anything UserOfficeProject/issue-tracker#1211

Open

YufanKambang changed the title ~~investigation result, found query function related to bug~~ Fix bug for searching by proposal ID failing to find proposal due to whitespace Feb 10, 2026

YufanKambang changed the title ~~Fix bug for searching by proposal ID failing to find proposal due to whitespace~~ Fix: bug for searching by proposal ID failing to find proposal due to whitespace Feb 10, 2026

located the concrete implementation of getProposalById

69bb892

Merge branch 'develop' into 1211-bug-when-whitespace-in-proposal-id-s…

066ec97

…earch

added fix for whitespace bug for proposal id

6989078

YufanKambang changed the title ~~Fix: bug for searching by proposal ID failing to find proposal due to whitespace~~ fix: bug for searching by proposal ID failing to find proposal due to whitespace Feb 16, 2026

Merge branch 'develop' into 1211-bug-when-whitespace-in-proposal-id-s…

bbcddd4

…earch

YufanKambang marked this pull request as ready for review February 17, 2026 10:10

YufanKambang requested a review from a team as a code owner February 17, 2026 10:10

YufanKambang requested review from ellen-wright and mutambaraf and removed request for a team February 17, 2026 10:10

mutambaraf reviewed Feb 17, 2026

View reviewed changes

apps/backend/src/queries/ProposalQueries.ts Outdated Show resolved Hide resolved

apps/backend/src/queries/ProposalQueries.ts Outdated Show resolved Hide resolved

apps/backend/src/datasources/postgres/ProposalDataSource.ts Outdated Show resolved Hide resolved

ellen-wright reviewed Feb 17, 2026

View reviewed changes

YufanKambang added 3 commits February 17, 2026 17:59

comment related changes

503e208

Merge branch '1211-bug-when-whitespace-in-proposal-id-search' of http…

51c79e3

…s://github.com/UserOfficeProject/user-office-core into 1211-bug-when-whitespace-in-proposal-id-search

added unit test for whitespaces

71fc206

updating unit test

fcd362c

YufanKambang requested review from ellen-wright, martin-trajanovski and mutambaraf February 18, 2026 08:44

YufanKambang requested review from a team and Junjiequan and removed request for a team and martin-trajanovski February 18, 2026 09:14

YufanKambang and others added 2 commits February 18, 2026 11:20

Merge branch 'develop' into 1211-bug-when-whitespace-in-proposal-id-s…

0724b46

…earch

fixed whitespace for instrument scientist table

2226c14

yoganandaness requested changes Feb 19, 2026

View reviewed changes

Merge branch 'develop' into 1211-bug-when-whitespace-in-proposal-id-s…

9779673

…earch

YufanKambang added 3 commits March 4, 2026 08:51

user-officer whitespace fix in datasource layer

6552eb2

intrument-scientist proposal view whitespace fix

8bd45b5

actual intrument-scientist proposal view whitespace fix

f91f862

YufanKambang requested a review from yoganandaness March 4, 2026 11:02

yoganandaness approved these changes Mar 4, 2026

View reviewed changes

YufanKambang added 2 commits March 5, 2026 09:11

Merge branch 'develop' into 1211-bug-when-whitespace-in-proposal-id-s…

6b2c560

…earch

Merge branch 'develop' into 1211-bug-when-whitespace-in-proposal-id-s…

1d35b90

…earch

Conversation

YufanKambang commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Motivation and Context

How Has This Been Tested

Fixes

Changes

Depends on

Tests included/Docs Updated?

Uh oh!

YufanKambang commented Feb 10, 2026

Uh oh!

YufanKambang commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

YufanKambang commented Feb 11, 2026

Uh oh!

YufanKambang commented Feb 12, 2026

Uh oh!

mutambaraf left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ellen-wright Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

YufanKambang Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

YufanKambang Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

YufanKambang Feb 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

YufanKambang Feb 18, 2026

Choose a reason for hiding this comment

Uh oh!

YufanKambang commented Feb 17, 2026

Uh oh!

YufanKambang commented Feb 17, 2026

Uh oh!

YufanKambang commented Feb 17, 2026

Uh oh!

YufanKambang commented Feb 18, 2026

Uh oh!

Uh oh!

yoganandaness Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

YufanKambang Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

YufanKambang Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

YufanKambang commented Feb 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

YufanKambang commented Feb 9, 2026 •

edited

Loading

YufanKambang commented Feb 10, 2026 •

edited

Loading

YufanKambang Feb 18, 2026 •

edited

Loading