Changes to Provider Get filter (#765)

* Changes to filter were added * Fix code smell
ita-social-projects · Jul 23, 2022 · a795c76 · a795c76
1 parent c9c22f4
commit a795c76
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/OutOfSchool/OutOfSchool.WebApi/Services/ProviderService.cs b/OutOfSchool/OutOfSchool.WebApi/Services/ProviderService.cs
@@ -112,10 +112,10 @@ public async Task<SearchResult<ProviderDto>> GetByFilter(ProviderFilter filter)
             .Get(
                 skip: filter.From,
                 take: filter.Size,
-                includeProperties: "ActualAddress,LegalAddress,Institution,ProviderSectionItems,Images",
+                includeProperties: string.Empty,
                 where: filterPredicate,
                 orderBy: sortExpression,
-                asNoTracking: true)
+                asNoTracking: false)
             .ToListAsync()
             .ConfigureAwait(false);
 
@@ -548,11 +548,11 @@ private Expression<Func<Provider, bool>> PredicateBuild(ProviderFilter filter)
             foreach (var word in filter.SearchString.Split(' ', ',', StringSplitOptions.RemoveEmptyEntries))
             {
                 tempPredicate = tempPredicate.Or(
-                    x => x.User.FirstName.StartsWith(word, StringComparison.InvariantCultureIgnoreCase)
-                        || x.User.LastName.StartsWith(word, StringComparison.InvariantCultureIgnoreCase)
-                        || x.User.MiddleName.StartsWith(word, StringComparison.InvariantCultureIgnoreCase)
-                        || x.Email.StartsWith(word, StringComparison.InvariantCultureIgnoreCase)
-                        || x.PhoneNumber.Contains(word, StringComparison.InvariantCulture));
+                    x => x.FullTitle.Contains(word, StringComparison.InvariantCultureIgnoreCase)
+                        || x.ShortTitle.Contains(word, StringComparison.InvariantCultureIgnoreCase)
+                        || x.ActualAddress.City.StartsWith(word, StringComparison.InvariantCultureIgnoreCase)
+                        || x.LegalAddress.City.StartsWith(word, StringComparison.InvariantCulture)
+                        || x.EdrpouIpn.ToString().StartsWith(word, StringComparison.InvariantCultureIgnoreCase));
             }
 
             predicate = predicate.And(tempPredicate);