[HER-150] Add fuzzy search for camera Ids (#82)

* [HER-150] Add fuzzy search for camera Ids * [HER-150] Fix camera filter * [HER-150] Change filters for cameras and detections
nerds-sh · Aug 16, 2021 · e21018a · e21018a
1 parent a934607
commit e21018a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Data/Camera/Filtering/CameraFilter.cs b/src/Data/Camera/Filtering/CameraFilter.cs
@@ -2,6 +2,8 @@ namespace Data.Camera.Filtering
 {
     using System.Linq;
     using Business.Camera.Fetching.Models;
+    using Microsoft.EntityFrameworkCore;
+    using MySql.EntityFrameworkCore.Extensions;
 
     public class CameraFilter : ICameraFilter
     {
@@ -22,10 +24,9 @@ public IQueryable<ECamera> Execute(IQueryable<ECamera> input)
             return MatchGreaterLongitude(input);
         }
 
-        private IQueryable<ECamera> MatchId(IQueryable<ECamera> input) =>
-            _parameter.Ids != null
-                ? input.Where(entity => _parameter.Ids.Contains(entity.Id))
-                : input;
+        private IQueryable<ECamera> MatchId(IQueryable<ECamera> input) => _parameter.Ids != null
+            ? input.Where(entity => EF.Functions.Like(_parameter.Ids.Contains(entity.Id), $"%{_parameter.Ids}%"))
+            : input;
 
         private IQueryable<ECamera> MatchLesserLatitude(IQueryable<ECamera> input) =>
             _parameter.Latitude.LesserEqualThan != null

diff --git a/src/Data/Detection/Filtering/DetectionFilter.cs b/src/Data/Detection/Filtering/DetectionFilter.cs
@@ -3,6 +3,7 @@ namespace Data.Detection.Filtering
     using System.Linq;
     using Business.Detection.Fetching.Models;
     using Microsoft.EntityFrameworkCore;
+    using MySql.EntityFrameworkCore.Extensions;
 
     public class DetectionFilter : IDetectionFilter
     {
@@ -55,6 +56,6 @@ private IQueryable<EDetection> MatchTimestampGreaterThan(IQueryable<EDetection>
                 : input;
 
         private IQueryable<EDetection> MatchCameraIds(IQueryable<EDetection> input) =>
-            _parameter.CameraIds == null ? input : input.Where(detection => _parameter.CameraIds.Contains(detection.CameraId));
+            _parameter.CameraIds == null ? input : input.Where(detection => EF.Functions.Like(_parameter.CameraIds.Contains(detection.CameraId), $"%{_parameter.CameraIds}%"));
     }
 }