remove check that doubles

ita-social-projects · Aug 5, 2021 · 1d06fb5 · 1d06fb5
1 parent b992614
commit 1d06fb5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/OutOfSchool/OutOfSchool.ElasticsearchData/ESWorkshopProvider.cs b/OutOfSchool/OutOfSchool.ElasticsearchData/ESWorkshopProvider.cs
@@ -58,7 +58,7 @@ private QueryContainer CreateQueryFromFilter(WorkshopFilterES filter)
                 return queryContainer;
             }
 
-            if (!(string.IsNullOrEmpty(filter.SearchText) || string.IsNullOrWhiteSpace(filter.SearchText)))
+            if (!string.IsNullOrWhiteSpace(filter.SearchText))
             {
                 queryContainer &= new MultiMatchQuery()
                 {
@@ -151,7 +151,7 @@ private QueryContainer CreateQueryFromFilter(WorkshopFilterES filter)
                 };
             }
 
-            if (!(string.IsNullOrEmpty(filter.City) || string.IsNullOrWhiteSpace(filter.City)))
+            if (!string.IsNullOrWhiteSpace(filter.City))
             {
                 queryContainer &= new MatchQuery()
                 {

diff --git a/OutOfSchool/OutOfSchool.WebApi/Controllers/WorkshopController.cs b/OutOfSchool/OutOfSchool.WebApi/Controllers/WorkshopController.cs
@@ -105,7 +105,7 @@ public async Task<IActionResult> GetByProviderId(long id)
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
         public async Task<IActionResult> GetByFilter([FromQuery] WorkshopFilter filter)
         {
-            if (string.IsNullOrEmpty(filter.City) || string.IsNullOrWhiteSpace(filter.City))
+            if (string.IsNullOrWhiteSpace(filter.City))
             {
                 filter.City = "Êè¿â";
             }

diff --git a/OutOfSchool/OutOfSchool.WebApi/Services/Database/WorkshopService.cs b/OutOfSchool/OutOfSchool.WebApi/Services/Database/WorkshopService.cs
@@ -280,7 +280,7 @@ private Expression<Func<Workshop, bool>> PredicateBuild(WorkshopFilter filter)
                 return predicate;
             }
 
-            if (!(string.IsNullOrEmpty(filter.SearchText) || string.IsNullOrWhiteSpace(filter.SearchText)))
+            if (!string.IsNullOrWhiteSpace(filter.SearchText))
             {
                 var tempPredicate = PredicateBuilder.False<Workshop>();
                 foreach (var word in filter.SearchText.Split(' ', ',', StringSplitOptions.RemoveEmptyEntries))
@@ -325,7 +325,7 @@ private Expression<Func<Workshop, bool>> PredicateBuild(WorkshopFilter filter)
                 predicate = predicate.And(x => x.WithDisabilityOptions);
             }
 
-            if (!(string.IsNullOrEmpty(filter.City) || string.IsNullOrWhiteSpace(filter.City)))
+            if (!string.IsNullOrWhiteSpace(filter.City))
             {
                 predicate = predicate.And(x => x.Address.City == filter.City);
             }