Skip to content
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

Jump to bottom

add missing office where clause in Clob getAll query #937

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

add missing office where clause in Clob getAll query #937

wants to merge 1 commit into from

Conversation

adamkorynta
Copy link
Collaborator

No description provided.

@rma-rripken
Copy link
Collaborator

Since we (probably me) got this wrong at least once there should probably be tests that go along with these changes.
This pr still isn't right. The count sub-query uses JooqDao.caseInsensitiveLikeRegex but the data retrieval part uses 'DSL.upper(v_office.OFFICE_ID).like(officeLike.toUpperCase()))' those should align -right? at least I think they should.
The paging also doesn't look right. I guess it was broken before you got here but it seems to me that this needs to order by officeId and clobId

rma-rripken
rma-rripken requested changes Nov 1, 2024
View reviewed changes
cwms-data-api/src/main/java/cwms/cda/data/dao/ClobDao.java
.join(v_office).on(v_clob.OFFICE_CODE.eq(v_office.OFFICE_CODE))
.where(JooqDao.caseInsensitiveLikeRegex(v_clob.ID,idRegex))
.and(DSL.upper(v_clob.ID).greaterThan(clobCursor))
.and(officeLike == null ? noCondition() : DSL.upper(v_office.OFFICE_ID).like(officeLike.toUpperCase()))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be caseInsensitiveRegexLike -right?
Paging should also order by office and clobId.
Probably need test
Is there an approved issue for these changes?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issue, I'll create one, good call on the regex.

@adamkorynta adamkorynta mentioned this pull request Nov 1, 2024
Open
@MikeNeilson MikeNeilson linked an issue Nov 5, 2024 that may be closed by this pull request
Clob getAll missing office filter in query #939
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rma-rripken rma-rripken rma-rripken requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Clob getAll missing office filter in query
2 participants
@adamkorynta @rma-rripken