[HER-153] Fix fuzzy search (#83)

* [HER-153] Fix fuzzy search in CameraFilter * [HER-153] Fix fuzzy search in DetectionFilter * [HER-153] Add package for predicate
nerds-sh · Aug 17, 2021 · a6b9a2b · a6b9a2b
1 parent e21018a
commit a6b9a2b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/src/Data/Camera/Filtering/CameraFilter.cs b/src/Data/Camera/Filtering/CameraFilter.cs
@@ -1,9 +1,10 @@
 namespace Data.Camera.Filtering
 {
+    using System.Collections.Generic;
     using System.Linq;
     using Business.Camera.Fetching.Models;
+    using LinqKit;
     using Microsoft.EntityFrameworkCore;
-    using MySql.EntityFrameworkCore.Extensions;
 
     public class CameraFilter : ICameraFilter
     {
@@ -25,9 +26,20 @@ public IQueryable<ECamera> Execute(IQueryable<ECamera> input)
         }
 
         private IQueryable<ECamera> MatchId(IQueryable<ECamera> input) => _parameter.Ids != null
-            ? input.Where(entity => EF.Functions.Like(_parameter.Ids.Contains(entity.Id), $"%{_parameter.Ids}%"))
+            ? MatchByIds(input, _parameter.Ids)
             : input;
 
+        private static IQueryable<ECamera> MatchByIds(IQueryable<ECamera> input, List<string> ids)
+        {
+            var predicate = PredicateBuilder.New<ECamera>();
+            foreach (var id in ids)
+            {
+                predicate = predicate.Or(entity => EF.Functions.Like(entity.Id, $"%{id}%"));
+            }
+
+            return input.Where(predicate);
+        }
+
         private IQueryable<ECamera> MatchLesserLatitude(IQueryable<ECamera> input) =>
             _parameter.Latitude.LesserEqualThan != null
                 ? input.Where(camera => camera.Latitude <= _parameter.Latitude.LesserEqualThan)

diff --git a/src/Data/Data.csproj b/src/Data/Data.csproj
@@ -7,6 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="LinqKit" Version="1.1.26" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Data/Detection/Filtering/DetectionFilter.cs b/src/Data/Detection/Filtering/DetectionFilter.cs
@@ -1,7 +1,9 @@
 namespace Data.Detection.Filtering
 {
+    using System.Collections.Generic;
     using System.Linq;
     using Business.Detection.Fetching.Models;
+    using LinqKit;
     using Microsoft.EntityFrameworkCore;
     using MySql.EntityFrameworkCore.Extensions;
 
@@ -56,6 +58,17 @@ private IQueryable<EDetection> MatchTimestampGreaterThan(IQueryable<EDetection>
                 : input;
 
         private IQueryable<EDetection> MatchCameraIds(IQueryable<EDetection> input) =>
-            _parameter.CameraIds == null ? input : input.Where(detection => EF.Functions.Like(_parameter.CameraIds.Contains(detection.CameraId), $"%{_parameter.CameraIds}%"));
+            _parameter.CameraIds == null ? input : MatchByCameraIds(input, _parameter.CameraIds);
+
+        private static IQueryable<EDetection> MatchByCameraIds(IQueryable<EDetection> input, List<string> ids)
+        {
+            var predicate = PredicateBuilder.New<EDetection>();
+            foreach (var id in ids)
+            {
+                predicate = predicate.Or(detections => EF.Functions.Like(detections.CameraId, $"%{id}%"));
+            }
+
+            return input.Where(predicate);
+        }
     }
 }