clean up query

mlapaglia · Jun 22, 2021 · 6c3e969 · 6c3e969
1 parent 116766d
commit 6c3e969
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/OpenAlprWebhookProcessor/LicensePlates/SearchLicensePlates/SearchLicensePlateHandler.cs b/OpenAlprWebhookProcessor/LicensePlates/SearchLicensePlates/SearchLicensePlateHandler.cs
@@ -40,7 +40,7 @@ public async Task<SearchLicensePlateResponse> HandleAsync(
                 }
                 else
                 {
-                    dbRequest = dbRequest.Where(x => x.PossibleNumbers.Contains(request.PlateNumber));
+                    dbRequest = dbRequest.Where(x => x.PossibleNumbers.Contains(request.PlateNumber) || request.PlateNumber == x.BestNumber);
                 }
             }
 
@@ -56,23 +56,13 @@ public async Task<SearchLicensePlateResponse> HandleAsync(
                 dbRequest = dbRequest.Where(x => x.ReceivedOnEpoch <= endEpochMilliseconds);
             }
 
-            var platesToIgnore = await _processerContext.Ignores.ToListAsync(cancellationToken);
+            var platesToIgnore = (await _processerContext.Ignores
+                .Select(x => x.PlateNumber)
+                .ToListAsync(cancellationToken));
 
             if (!request.FilterIgnoredPlates)
             {
-                foreach (var plateToIgnore in platesToIgnore)
-                {
-                    if (plateToIgnore.IsStrictMatch)
-                    {
-                        dbRequest = dbRequest.Where(x => plateToIgnore.PlateNumber != x.BestNumber);
-                    }
-                    else
-                    {
-                        dbRequest = dbRequest.Where(x =>
-                            plateToIgnore.PlateNumber != x.BestNumber
-                            || !x.PossibleNumbers.Contains(plateToIgnore.PlateNumber));
-                    }
-                }
+                dbRequest = dbRequest.Where(x => !platesToIgnore.Contains(x.PossibleNumbers) && !platesToIgnore.Contains(x.BestNumber));
             }
 
             if (!string.IsNullOrWhiteSpace(request.VehicleMake))
@@ -112,7 +102,7 @@ public async Task<SearchLicensePlateResponse> HandleAsync(
             {
                 licensePlates.Add(PlateMapper.MapPlate(
                     plate,
-                    platesToIgnore.Select(x => x.PlateNumber).ToList(),
+                    platesToIgnore,
                     platesToAlert));
             }