check for exact category match on upload search (#5328)

Deanstirrat · web-flow · commit 05fbfce865bc · 2023-10-07T22:30:27.000+09:00
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt
@@ -83,7 +83,8 @@ class CategoriesPresenter @Inject constructor(
         if (media == null) {
             return repository.searchAll(term, getImageTitleList(), repository.selectedDepictions)
                 .subscribeOn(ioScheduler)
-                .map { it.filterNot { categoryItem -> repository.containsYear(categoryItem.name) } }
+                .map { it.filter { categoryItem -> !repository.containsYear(categoryItem.name)
+                        || categoryItem.name==term } }
         } else {
             return Observable.zip(
                 repository.getCategories(repository.selectedExistingCategories)
@@ -97,7 +98,8 @@ class CategoriesPresenter @Inject constructor(
                 }
             )
                 .subscribeOn(ioScheduler)
-                .map { it.filterNot { categoryItem -> repository.containsYear(categoryItem.name) } }
+                .map { it.filter { categoryItem -> !repository.containsYear(categoryItem.name)
+                        || categoryItem.name==term } }
                 .map { it.filterNot { categoryItem -> categoryItem.thumbnail == "hidden" } }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,8 @@ class CategoriesPresenter @Inject constructor(`
`83`	`83`	`if (media == null) {`
`84`	`84`	`return repository.searchAll(term, getImageTitleList(), repository.selectedDepictions)`
`85`	`85`	`.subscribeOn(ioScheduler)`
`86`		`- .map { it.filterNot { categoryItem -> repository.containsYear(categoryItem.name) } }`
	`86`	`+ .map { it.filter { categoryItem -> !repository.containsYear(categoryItem.name)`
	`87`	`+ \|\| categoryItem.name==term } }`
`87`	`88`	`} else {`
`88`	`89`	`return Observable.zip(`
`89`	`90`	`repository.getCategories(repository.selectedExistingCategories)`
`@@ -97,7 +98,8 @@ class CategoriesPresenter @Inject constructor(`
`97`	`98`	`}`
`98`	`99`	`)`
`99`	`100`	`.subscribeOn(ioScheduler)`
`100`		`- .map { it.filterNot { categoryItem -> repository.containsYear(categoryItem.name) } }`
	`101`	`+ .map { it.filter { categoryItem -> !repository.containsYear(categoryItem.name)`
	`102`	`+ \|\| categoryItem.name==term } }`
`101`	`103`	`.map { it.filterNot { categoryItem -> categoryItem.thumbnail == "hidden" } }`
`102`	`104`	`}`
`103`	`105`	`}`