fix(rest): Added code to filter user based on givenname lastname emaid. by nikkuma7 · Pull Request #4105 · eclipse-sw360/sw360

nikkuma7 · 2026-04-21T05:36:08Z

Please provide a summary of your changes here.

Which issue is this pull request belonging to and how is it solving it? (Refer to issue here)

Did you add or update any new dependencies that are required for your change?

Issue: Closes #4095

Suggest Reviewer

You can suggest reviewers here with an @mention.

How To Test?

URL: get : http://localhost:8080/resource/api/users?searchTerm=@sw360.org&page=0&size=5&sort=lastname,asc

NOTE : Please test "Exact Match" scenario as well.

How should these changes be tested by the reviewer?
Have you implemented any additional tests?

Checklist

Must:

All related issues are referenced in commit messages and in PR

GMishx · 2026-04-28T12:36:49Z

+        if (CommonUtils.isNotNullEmptyOrWhitespace(searchText)) {
+            if (luceneSearch) {
+                paginatedUsers = userService.searchUsersByNameOrEmail(searchText.trim(), pageable);
+            } else {
+                paginatedUsers = userService.searchUsersByNameOrEmailExact(searchText.trim(), pageable);
+            }


Ah, searchText will only work with luceneSearch=true. With lucene as false, the usecase does not make sense!

GMishx · 2026-04-28T12:37:23Z

+    public Map<PaginationData, List<User>> searchUsersByNameOrEmailExact(String searchTerm, Pageable pageable) throws TException {
+        UserService.Iface sw360UserClient = getThriftUserClient();
+        PaginationData pageData = pageableToPaginationData(pageable);
+        return sw360UserClient.searchUsersByNameOrEmailExact(searchTerm, pageData);
+    }
+


Don't need this function.

GMishx · 2026-04-28T12:37:37Z

+    /**
+     * Search users by an exact term matched against givenname, lastname, or email.
+     * Uses CouchDB $eq OR query — no wildcard or regex.
+     **/
+    map<PaginationData, list<User>> searchUsersByNameOrEmailExact(1: string searchTerm, 2: PaginationData pageData) throws (1: SW360Exception exp);
+


Don't need this function.

GMishx · 2026-04-28T12:39:10Z

+            // Exception propagated (unlikely as connector swallows it) — fall back immediately
+            log.warn("Lucene/Nouveau search threw exception for text='{}', falling back to query: {}", text, e.getMessage());
+            return repository.searchByNameOrEmail(text, pageData);


No, no fallback is required. If the nouveau query failed, the entire request must fail.

GMishx · 2026-04-28T12:39:35Z

+    /**
+     * Search users where givenname, lastname, or email exactly matches the search term.
+     */
+    public Map<PaginationData, List<User>> searchByNameOrEmailExact(String searchTerm, PaginationData pageData) {


As mentioned, we don't need this function.

GMishx · 2026-04-28T12:40:32Z

+        List<User> users = getConnector().getQueryResultPaginated(
+                qb, User.class, pageData, sortSelector
+        );


Using query here will not get you results from Nouveau.

Please create a function similar to VulnerabilitySearchHandler::search() in UserSearchHandler

sw360/backend/common/src/main/java/org/eclipse/sw360/datahandler/db/VulnerabilitySearchHandler.java

Lines 96 to 111 in 94f80ea

public Map<PaginationData, List<Vulnerability>> search(String searchText, String cveId, PaginationData pageData) {

Map<String, Set<String>> subQueryRestrictions = new HashMap<>();

if (CommonUtils.isNotNullEmptyOrWhitespace(searchText)) {

subQueryRestrictions.put(Vulnerability._Fields.TITLE.getFieldName(), Collections.singleton(searchText));

subQueryRestrictions.put(Vulnerability._Fields.EXTERNAL_ID.getFieldName(), Collections.singleton(searchText));

}

if (CommonUtils.isNotNullEmptyOrWhitespace(cveId)) {

subQueryRestrictions.put(Vulnerability._Fields.CVE_REFERENCES.getFieldName(), Collections.singleton(cveId));

}

String sortColumn = getSortColumnName(pageData);

return connector.searchViewWithRestrictionsWithOr(Vulnerability.class,

luceneSearchView.getIndexName(), null, subQueryRestrictions,

pageData, sortColumn, pageData.isAscending());

}

As you can see, this function takes a search string as input and matches it against Title and External ID, which will be the user's name and email in this case.

GMishx · 2026-04-28T12:45:52Z

+     */
+    public Map<PaginationData, List<User>> searchByNameOrEmail(String searchTerm, PaginationData pageData) {
+        // Escape special regex chars, then build a case-insensitive prefix pattern
+        String escaped = searchTerm.replaceAll("([.+*?^${}()|\\[\\]\\\\])", "\\\\$1");


When using the Nouveau to search as suggested, this filtering will be taken care by NouveauLuceneAwareDatabaseConnector

GMishx · 2026-04-28T12:48:55Z

@nikkuma7

We do not want exact search for this parameter. It cannot be done. This is a free text search and thus you cannot make it exact match. For that, we have the individual filters based on name, email, etc.
Please use the suggested VulnerabilitySearchHandler approach using Nouveau. This implementation will have 3 OR conditions on givenname, lastname or email instead of title or externalid in VulnerabilitySearchHandler

nikkuma7 · 2026-05-06T04:51:50Z

@GMishx , Comment addressed.

nikkuma7 · 2026-05-06T05:05:00Z

…lid. Signed-off-by: Nikesh Kumar <kumar.nikesh@siemens.com>

nikkuma7 requested review from GMishx, KoukiHama, ag4ums and arunazhakesan as code owners April 21, 2026 05:36

nikkuma7 force-pushed the fix/searchuserby_name_email_lastname branch from a97b53e to f0be599 Compare April 21, 2026 05:53

nikkuma7 added needs code review needs general test This is general testing, meaning that there is no org specific issue to check for labels Apr 21, 2026

nikkuma7 force-pushed the fix/searchuserby_name_email_lastname branch 4 times, most recently from d390ce3 to f2692dd Compare April 22, 2026 06:23

GMishx requested changes Apr 28, 2026

View reviewed changes

nikkuma7 force-pushed the fix/searchuserby_name_email_lastname branch 3 times, most recently from 819c09a to 6ed93ae Compare May 6, 2026 04:50

fix(rest): Added code to filter user based on givenname lastname emai…

1b94976

…lid. Signed-off-by: Nikesh Kumar <kumar.nikesh@siemens.com>

nikkuma7 force-pushed the fix/searchuserby_name_email_lastname branch from 6ed93ae to 1b94976 Compare May 6, 2026 05:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(rest): Added code to filter user based on givenname lastname emaid.#4105

fix(rest): Added code to filter user based on givenname lastname emaid.#4105
nikkuma7 wants to merge 1 commit intomainfrom
fix/searchuserby_name_email_lastname

nikkuma7 commented Apr 21, 2026 •

edited

Loading

Uh oh!

GMishx Apr 28, 2026

Uh oh!

GMishx Apr 28, 2026

Uh oh!

GMishx Apr 28, 2026

Uh oh!

GMishx Apr 28, 2026

Uh oh!

GMishx Apr 28, 2026

Uh oh!

GMishx Apr 28, 2026

Uh oh!

GMishx Apr 28, 2026

Uh oh!

GMishx Apr 28, 2026

Uh oh!

GMishx commented Apr 28, 2026

Uh oh!

nikkuma7 commented May 6, 2026

Uh oh!

nikkuma7 commented May 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	public Map<PaginationData, List<Vulnerability>> search(String searchText, String cveId, PaginationData pageData) {
	Map<String, Set<String>> subQueryRestrictions = new HashMap<>();
	if (CommonUtils.isNotNullEmptyOrWhitespace(searchText)) {
	subQueryRestrictions.put(Vulnerability._Fields.TITLE.getFieldName(), Collections.singleton(searchText));
	subQueryRestrictions.put(Vulnerability._Fields.EXTERNAL_ID.getFieldName(), Collections.singleton(searchText));
	}
	if (CommonUtils.isNotNullEmptyOrWhitespace(cveId)) {
	subQueryRestrictions.put(Vulnerability._Fields.CVE_REFERENCES.getFieldName(), Collections.singleton(cveId));
	}

	String sortColumn = getSortColumnName(pageData);

	return connector.searchViewWithRestrictionsWithOr(Vulnerability.class,
	luceneSearchView.getIndexName(), null, subQueryRestrictions,
	pageData, sortColumn, pageData.isAscending());
	}

Conversation

nikkuma7 commented Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Suggest Reviewer

How To Test?

Checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GMishx commented Apr 28, 2026

Uh oh!

nikkuma7 commented May 6, 2026

Uh oh!

nikkuma7 commented May 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

nikkuma7 commented Apr 21, 2026 •

edited

Loading