Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 27 additions & 22 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,44 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<!-- SQLitePCLRaw.lib.e_sqlite3 2.1.11 (CVE-2025-6965 / GHSA-2m69-gcr7-jv3q) has no patched NuGet version yet.
It is a transitive dependency of Microsoft.EntityFrameworkCore.Sqlite. Suppress until upstream releases a fix. -->
<ItemGroup>
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-2m69-gcr7-jv3q" />
</ItemGroup>
<ItemGroup>
<!-- EF Core 10 -->
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
<!-- ASP.NET Core / hosting -->
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.9" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.14.2" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.16.5" />
<!-- Microsoft.Extensions.* -->
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
<PackageVersion
Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="10.0.8"
Version="10.0.9"
/>
<PackageVersion
Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"
Version="10.0.8"
Version="10.0.9"
/>
<PackageVersion
Include="Microsoft.Extensions.DependencyInjection.Abstractions"
Version="10.0.8"
Version="10.0.9"
/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.9" />
<PackageVersion
Include="Microsoft.Extensions.Options.ConfigurationExtensions"
Version="10.0.8"
Version="10.0.9"
/>
<!-- Logging -->
<PackageVersion Include="Serilog" Version="4.3.1" />
Expand All @@ -52,21 +57,21 @@
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.6" />
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
<!-- Email parsing -->
<PackageVersion Include="MimeKit" Version="4.15.1" />
<PackageVersion Include="MimeKit" Version="4.17.0" />
<PackageVersion Include="MailKit" Version="4.15.1" />
<!-- HTML parsing -->
<PackageVersion Include="HtmlAgilityPack" Version="1.11.72" />
<PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
<!-- HTTP resilience -->
<PackageVersion Include="Polly" Version="8.5.0" />
<PackageVersion Include="Polly" Version="8.7.0" />
<PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
<!-- Rate limiting -->
<PackageVersion Include="AspNetCoreRateLimit" Version="5.0.0" />
<!-- Testing -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="FluentAssertions" Version="8.10.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.9" />
<PackageVersion Include="Testcontainers" Version="4.1.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
Expand Down
8 changes: 4 additions & 4 deletions src/DaftAlerts.Infrastructure/Parsing/DaftEmailParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ private static (string? DaftUrl, string? DaftId) ExtractListingUrlAndId(HtmlDocu
{
var candidates = new[]
{
a.GetAttributeValue("originalsrc", null),
a.GetAttributeValue("href", null),
a.GetAttributeValue("originalsrc", ""),
a.GetAttributeValue("href", ""),
};

foreach (var raw in candidates)
Expand Down Expand Up @@ -268,7 +268,7 @@ private static int ExtractFirstInt(string text, Regex regex)
{
foreach (var img in doc.DocumentNode.SelectNodes("//img") ?? Enumerable.Empty<HtmlNode>())
{
var src = img.GetAttributeValue("src", null);
var src = img.GetAttributeValue("src", "");
if (string.IsNullOrWhiteSpace(src))
continue;
var m = BerRegex().Match(src);
Expand All @@ -285,7 +285,7 @@ private static int ExtractFirstInt(string text, Regex regex)
{
foreach (var img in doc.DocumentNode.SelectNodes("//img") ?? Enumerable.Empty<HtmlNode>())
{
var src = img.GetAttributeValue("src", null);
var src = img.GetAttributeValue("src", "");
if (string.IsNullOrWhiteSpace(src))
continue;
if (src.Contains("media.daft.ie", StringComparison.OrdinalIgnoreCase))
Expand Down
22 changes: 20 additions & 2 deletions tests/DaftAlerts.Api.Tests/Endpoints/PropertiesEndpointTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,26 @@ public async Task Bulk_recycle_updates_count()
using var db = _factory.CreateDbContext();
var toRecycle = new[]
{
NewProperty("bulk-1", "D09", PropertyStatus.Inbox, 1000, 1, null, "Apartment", DateTime.UtcNow.AddDays(-10)),
NewProperty("bulk-2", "D09", PropertyStatus.Inbox, 1000, 1, null, "Apartment", DateTime.UtcNow.AddDays(-11)),
NewProperty(
"bulk-1",
"D09",
PropertyStatus.Inbox,
1000,
1,
null,
"Apartment",
DateTime.UtcNow.AddDays(-10)
),
NewProperty(
"bulk-2",
"D09",
PropertyStatus.Inbox,
1000,
1,
null,
"Apartment",
DateTime.UtcNow.AddDays(-11)
),
};
db.Properties.AddRange(toRecycle);
db.SaveChanges();
Expand Down