optimize searching for possible plate matches (#100)

* don't pull back jpegs

* Revert "don't pull back jpegs"

This reverts commit 2eeba0a.

* change to list

* migration

* fix up query

* do it this way

* negate that

* fix ef error

* cancel previous search

* don't trigger refresh when already searching

* try this to limit data being pulled back

* try always returning static count

* logging

* this

* add count back

* default max date

* html too

* look 15 days in past

* always reset

* set dates on cleaR

Author: mlapaglia

OpenAlprWebhookProcessor/Alerts/AlertService.cs

@@ -74,7 +74,7 @@ private async Task ProcessAlertsAsync()
 
                     if (job.IsStrictMatch)
                     {
-                        plateGroups = plateGroups.Where(x => x.Id == job.LicensePlateId || x.PossibleNumbers.Contains(job.LicensePlateId.ToString()));
+                        plateGroups = plateGroups.Where(x => x.Id == job.LicensePlateId || x.PossibleNumbers.Any(x => x.Number == job.LicensePlateId.ToString()));
                     }
                     else
                     {

OpenAlprWebhookProcessor/ClientApp/src/app/plates/plates.component.html

@@ -67,7 +67,7 @@
       <mat-card-content>
         <mat-form-field appearance="fill" style="width: 80%;">
           <mat-label>Enter a date range</mat-label>
-          <mat-date-range-input [rangePicker]="picker" >
+          <mat-date-range-input [rangePicker]="picker" [max]="todaysDate">
             <input matStartDate [(ngModel)]="filterStartOn" placeholder="Start date">
             <input matEndDate [(ngModel)]="filterEndOn" placeholder="End date">
           </mat-date-range-input>

OpenAlprWebhookProcessor/ClientApp/src/app/plates/plates.component.ts

@@ -17,7 +17,7 @@ import { VehicleFilters } from './vehicleFilters';
 import { MatDialog } from '@angular/material/dialog';
 import { EditPlateComponent } from './edit-plate/edit-plate.component';
 import { LocalStorageService } from '@app/_services/local-storage.service';
-import { EnrichersService } from '@app/settings/enrichers/enrichers.service';
+import { timeStamp } from 'console';
 
 @Component({
   selector: 'app-plates',
@@ -62,6 +62,7 @@ export class PlatesComponent implements OnInit, OnDestroy, AfterViewInit {
   public range: FormGroup;
   public plates: Plate[] = [];
   public totalNumberOfPlates: number;
+  public todaysDate: Date;
 
   public filterPlateNumber: string;
   public filterPlateNumberIsValid: boolean = true;
@@ -94,12 +95,12 @@ export class PlatesComponent implements OnInit, OnDestroy, AfterViewInit {
   private pageSizeCacheKey: string = "platePageSize";
   private pageNumber: number = 0;
 
-  private subscriptions = new Subscription();
-  
+  private eventSubscriptions = new Subscription();
+  private searchSubscription = new Subscription();
+
   @ViewChild(MatPaginator) paginator: MatPaginator;
 
   constructor(
-    private enricherService: EnrichersService,
     private plateService: PlateService,
     private signalRHub: SignalrService,
     private snackbarService: SnackbarService,
@@ -119,27 +120,40 @@ export class PlatesComponent implements OnInit, OnDestroy, AfterViewInit {
     this.pageSize = pageSize != null ? parseInt(pageSize) : 25;
     this.searchPlates();
     this.populateFilters();
+    this.setInitialDateFilter();
   }
 
   ngOnDestroy(): void {
-    this.subscriptions.unsubscribe();
+    this.eventSubscriptions.unsubscribe();
+    this.searchSubscription.unsubscribe();
   }
 
   ngAfterViewInit(): void {
     this.subscribeForUpdates();
   }
 
+  public setInitialDateFilter() {
+    this.todaysDate = new Date();
+    this.filterStartOn = new Date();
+    this.filterEndOn = new Date();
+    
+    this.filterStartOn.setDate(new Date().getDate() - 15);
+    this.filterEndOn = this.todaysDate;
+  }
+
   public editPlate(plateNumber: string) {
     this.openEditDialog(plateNumber);
   }
 
   public subscribeForUpdates() {
-    this.subscriptions.add(this.signalRHub.connectionStatusChanged.subscribe(status => {
+    this.eventSubscriptions.add(this.signalRHub.connectionStatusChanged.subscribe(status => {
       this.isSignalrConnected = status;
     }));
 
-    this.subscriptions.add(this.signalRHub.licensePlateReceived.subscribe(_ => {
-        this.searchPlates();
+    this.eventSubscriptions.add(this.signalRHub.licensePlateReceived.subscribe(_ => {
+        if (!this.isLoading) {
+          this.searchPlates();
+        }
     }));
   }
 
@@ -159,8 +173,6 @@ export class PlatesComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   public searchPlates(plateNumber: string = '') {
-    var request = new PlateRequest();
-
     if (!this.filterPlateNumberIsValid) {
       return;
     }
@@ -172,6 +184,8 @@ export class PlatesComponent implements OnInit, OnDestroy, AfterViewInit {
     this.filterStartOn?.setUTCHours(0,0,0,0);
     this.filterEndOn?.setUTCHours(23,59,59,999);
 
+    var request = new PlateRequest();
+
     request.pageNumber = this.pageNumber;
     request.pageSize = this.pageSize;
     request.endSearchOn = this.filterEndOn;
@@ -186,13 +200,18 @@ export class PlatesComponent implements OnInit, OnDestroy, AfterViewInit {
     request.vehicleType = this.filterVehicleType;
     request.vehicleRegion = this.filterVehicleRegion;
 
+    if (this.isLoading) {
+      this.searchSubscription.unsubscribe();
+    }
+
     this.isLoading = true;
-    this.plateService.searchPlates(request).subscribe(result => {
+    this.searchSubscription = this.plateService.searchPlates(request).subscribe(result => {
       this.totalNumberOfPlates = result.totalCount;
       this.plates = result.plates;
       this.isLoading = false;
     }, error => {
       this.isLoading = false;
+      this.snackbarService.create(`Error searching for plates, check the logs`, SnackBarType.Error)
     });
   }
 
@@ -237,8 +256,8 @@ export class PlatesComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   public clearFilters() {
-    this.filterEndOn = null;
-    this.filterStartOn = null;
+    this.setInitialDateFilter();
+
     this.filterPlateNumber = '';
     this.filterPlateNumberIsValid = true;
     this.filterStrictMatch = false;