Fixed searching music title causing status filter not working

Dyfused · Aug 11, 2022 · 5b6c1e7 · 5b6c1e7
1 parent 288da2e
commit 5b6c1e7
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/dataprovider/src/main/kotlin/explode/dataprovider/provider/mongo/MongoProvider.kt b/dataprovider/src/main/kotlin/explode/dataprovider/provider/mongo/MongoProvider.kt
@@ -187,23 +187,24 @@ class MongoProvider(private val config: MongoExplodeConfig, val detonate: Detona
 		showUnranked: Boolean,
 		showReview: Boolean
 	): List<MongoSet> {
-		return if(searchedName.isNotEmpty()) {
-			chartSetC.find((MongoSet::musicName).regex(searchedName, "i")).limit(limit).skip(skip).toList()
-			// chartSetC.find("""{ "musicName": ${searchedName.toFuzzySearch()} }""").limit(limit).skip(skip).toList()
-		} else if(showHidden) {
-			chartSetC.find(MongoSet::status eq SetStatus.HIDDEN).limit(limit).skip(skip).toList()
+		var filters = arrayOf<Bson>()
+		if(searchedName.isNotEmpty()) {
+			filters += (MongoSet::musicName).regex(searchedName, "i")
+		}
+		if(showHidden) {
+			filters += MongoSet::status eq SetStatus.HIDDEN
 		} else if(showReview) {
-			chartSetC.find(MongoSet::status eq SetStatus.NEED_REVIEW).limit(limit).skip(skip).toList()
+			filters += MongoSet::status eq SetStatus.NEED_REVIEW
 		} else if(showOfficial) {
-			chartSetC.find(MongoSet::status eq SetStatus.OFFICIAL).limit(limit).skip(skip).toList()
+			filters += MongoSet::status eq SetStatus.OFFICIAL
 		} else if(showRanked) {
-			chartSetC.find(or(MongoSet::status eq SetStatus.RANKED, MongoSet::status eq SetStatus.OFFICIAL))
-				.limit(limit).skip(skip).toList()
+			filters += or(MongoSet::status eq SetStatus.RANKED, MongoSet::status eq SetStatus.OFFICIAL)
 		} else if(showUnranked) {
-			chartSetC.find(MongoSet::status eq SetStatus.UNRANKED).limit(limit).skip(skip).toList()
-		} else {
-			listOf()
+			filters += MongoSet::status eq SetStatus.UNRANKED
 		}
+		chartSetC.find(MongoSet::status eq SetStatus.UNRANKED, MongoSet::status eq SetStatus.HIDDEN)
+
+		return chartSetC.find(*filters).limit(limit).skip(skip).toList()
 	}
 
 	fun getSetList(