Skip to content

Commit d2f2a43

Browse files
authored
fix color filtering (#106)
* fix color filtering * package upgrades * woops
1 parent b68e70a commit d2f2a43

4 files changed

Lines changed: 24 additions & 16 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ export class PlatesComponent implements OnInit, OnDestroy, AfterViewInit {
195195
request.filterIgnoredPlates = this.filterIgnoredPlates;
196196
request.filterPlatesSeenLessThan = this.filterPlatesSeenLessThan ? 10 : 0;
197197
request.regexSearchEnabled = this.regexSearchEnabled;
198+
request.vehicleColor = this.filterVehicleColor;
198199
request.vehicleMake = this.filterVehicleMake;
199200
request.vehicleModel = this.filterVehicleModel;
200201
request.vehicleType = this.filterVehicleType;

OpenAlprWebhookProcessor/LicensePlates/SearchLicensePlates/SearchLicensePlateHandler.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ public async Task<SearchLicensePlateResponse> HandleAsync(
6767
dbRequest = dbRequest.Where(x => !x.PossibleNumbers.Any(y => platesToIgnore.Contains(y.Number)) && !platesToIgnore.Contains(x.BestNumber));
6868
}
6969

70+
if (!string.IsNullOrWhiteSpace(request.VehicleColor))
71+
{
72+
dbRequest = dbRequest.Where(x => x.VehicleColor.Contains(request.VehicleColor.ToLower()));
73+
}
74+
7075
if (!string.IsNullOrWhiteSpace(request.VehicleMake))
7176
{
7277
dbRequest = dbRequest.Where(x => x.VehicleMakeModel.Contains(request.VehicleMake.ToLower()));

OpenAlprWebhookProcessor/LicensePlates/SearchLicensePlates/SearchLicensePlateRequest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public class SearchLicensePlateRequest
2020

2121
public int PageSize { get; set; }
2222

23+
public string VehicleColor { get; set; }
24+
2325
public string VehicleMake { get; set; }
2426

2527
public string VehicleModel { get; set; }

OpenAlprWebhookProcessor/OpenAlprWebhookProcessor.csproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="AutoMapper" Version="10.1.1" />
21-
<PackageReference Include="Bogus" Version="33.1.1" />
22-
<PackageReference Include="CoordinateSharp" Version="2.12.1.1" />
23-
<PackageReference Include="Flurl" Version="3.0.2" />
24-
<PackageReference Include="Hangfire" Version="1.7.26" />
25-
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.26" />
20+
<PackageReference Include="AutoMapper" Version="11.0.1" />
21+
<PackageReference Include="Bogus" Version="34.0.2" />
22+
<PackageReference Include="CoordinateSharp" Version="2.13.1.1" />
23+
<PackageReference Include="Flurl" Version="3.0.6" />
24+
<PackageReference Include="Hangfire" Version="1.7.31" />
25+
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.31" />
2626
<PackageReference Include="Hangfire.InMemory" Version="0.3.4" />
27-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.11" />
28-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.11" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-rc.2.21480.5">
27+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.8" />
28+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.8" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.8">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>
33-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.2" />
34-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
35-
<PackageReference Include="NUnit" Version="3.13.2" />
36-
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
37-
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
33+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.8" />
34+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
35+
<PackageReference Include="NUnit" Version="3.13.3" />
36+
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
37+
<PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
3838
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
39-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
40-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.0" />
39+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
40+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.22.1" />
4141
</ItemGroup>
4242

4343
<ItemGroup>

0 commit comments

Comments
 (0)