[AZ-376] [AZ-378] [AZ-379] [AZ-380] Repo cleanup: dead code, logger discipline, ColumnList consts
ci/woodpecker/push/01-test Pipeline was successful
ci/woodpecker/push/02-build-push Pipeline was successful

Batch 23 of refactor 03-code-quality-refactoring (4 tasks, 5 SP):

- AZ-376 (C23): Delete unused FindExistingTileAsync from
  ITileRepository / TileRepository. No callers; method also took the
  obsolete `version` arg removed by C06/AZ-357.
- AZ-378 (C25): Repository _logger discipline.
  TileRepository.GetTilesByRegionAsync now emits LogWarning when the
  query exceeds SlowQueryThresholdMs (500 ms). RegionRepository and
  RouteRepository drop the unused ILogger<TRepo> field, parameter, and
  using; Program.cs DI registrations updated.
- AZ-379 (C26): Extract `private const string ColumnList` per repo
  (TileRepository, RegionRepository, RouteRepository); SELECTs use
  $@"SELECT {ColumnList} FROM ..." (C# 10+ const interpolation).
  INSERT/UPDATE/DELETE unchanged; route_points single-site SELECT left
  inline.
- AZ-380 (C27): Delete dead alias GeoUtils.CalculatePolygonDiagonalDistance.

Tests: +9 new (RepositoryRefactorTests x8, GeoUtilsRefactorTests x1)
covering each AC via reflection / file-content assertions; pattern
mirrors ToolingConfigurationTests (b22) and AcceptanceCriteriaRT2Tests
(b19). Unit suite 181 -> 190, all green. dotnet format clean.

Code review: PASS_WITH_WARNINGS (3 Low findings, all informational or
out-of-scope for this batch). See
_docs/03_implementation/reviews/batch_23_review.md.

Cumulative review counter 2/3; next K=3 review fires after batch 24.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Oleksandr Bezdieniezhnykh
2026-05-11 04:57:49 +03:00
parent 534ab41b8e
commit 6099d1c86b
15 changed files with 475 additions and 106 deletions
@@ -6,7 +6,6 @@ public interface ITileRepository
{
Task<TileEntity?> GetByIdAsync(Guid id);
Task<TileEntity?> GetByTileCoordinatesAsync(int tileZoom, int tileX, int tileY);
Task<TileEntity?> FindExistingTileAsync(double latitude, double longitude, double tileSizeMeters, int zoomLevel, int version);
Task<IEnumerable<TileEntity>> GetTilesByRegionAsync(double latitude, double longitude, double sizeMeters, int zoomLevel);
Task<Guid> InsertAsync(TileEntity tile);
Task<int> UpdateAsync(TileEntity tile);
@@ -1,5 +1,4 @@
using Dapper;
using Microsoft.Extensions.Logging;
using Npgsql;
using SatelliteProvider.Common.Enums;
using SatelliteProvider.DataAccess.Models;
@@ -8,26 +7,26 @@ namespace SatelliteProvider.DataAccess.Repositories;
public class RegionRepository : IRegionRepository
{
private readonly string _connectionString;
private readonly ILogger<RegionRepository> _logger;
private const string ColumnList = @"id, latitude, longitude, size_meters as SizeMeters,
zoom_level as ZoomLevel, status,
csv_file_path as CsvFilePath, summary_file_path as SummaryFilePath,
tiles_downloaded as TilesDownloaded, tiles_reused as TilesReused,
stitch_tiles as StitchTiles,
created_at as CreatedAt, updated_at as UpdatedAt";
public RegionRepository(string connectionString, ILogger<RegionRepository> logger)
private readonly string _connectionString;
public RegionRepository(string connectionString)
{
_connectionString = connectionString;
_logger = logger;
}
public async Task<RegionEntity?> GetByIdAsync(Guid id)
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
SELECT id, latitude, longitude, size_meters as SizeMeters,
zoom_level as ZoomLevel, status,
csv_file_path as CsvFilePath, summary_file_path as SummaryFilePath,
tiles_downloaded as TilesDownloaded, tiles_reused as TilesReused,
stitch_tiles as StitchTiles,
created_at as CreatedAt, updated_at as UpdatedAt
FROM regions
const string sql = $@"
SELECT {ColumnList}
FROM regions
WHERE id = @Id";
var region = await connection.QuerySingleOrDefaultAsync<RegionEntity>(sql, new { Id = id });
@@ -37,14 +36,9 @@ public class RegionRepository : IRegionRepository
public async Task<IEnumerable<RegionEntity>> GetByStatusAsync(RegionStatus status)
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
SELECT id, latitude, longitude, size_meters as SizeMeters,
zoom_level as ZoomLevel, status,
csv_file_path as CsvFilePath, summary_file_path as SummaryFilePath,
tiles_downloaded as TilesDownloaded, tiles_reused as TilesReused,
stitch_tiles as StitchTiles,
created_at as CreatedAt, updated_at as UpdatedAt
FROM regions
const string sql = $@"
SELECT {ColumnList}
FROM regions
WHERE status = @Status
ORDER BY created_at ASC";
@@ -96,4 +90,3 @@ public class RegionRepository : IRegionRepository
return await connection.ExecuteAsync(sql, new { Id = id });
}
}
@@ -1,5 +1,4 @@
using Dapper;
using Microsoft.Extensions.Logging;
using Npgsql;
using SatelliteProvider.DataAccess.Models;
@@ -7,28 +6,28 @@ namespace SatelliteProvider.DataAccess.Repositories;
public class RouteRepository : IRouteRepository
{
private readonly string _connectionString;
private readonly ILogger<RouteRepository> _logger;
private const string ColumnList = @"id, name, description, region_size_meters as RegionSizeMeters,
zoom_level as ZoomLevel, total_distance_meters as TotalDistanceMeters,
total_points as TotalPoints, request_maps as RequestMaps,
maps_ready as MapsReady, create_tiles_zip as CreateTilesZip,
csv_file_path as CsvFilePath,
summary_file_path as SummaryFilePath, stitched_image_path as StitchedImagePath,
tiles_zip_path as TilesZipPath,
created_at as CreatedAt, updated_at as UpdatedAt";
public RouteRepository(string connectionString, ILogger<RouteRepository> logger)
private readonly string _connectionString;
public RouteRepository(string connectionString)
{
_connectionString = connectionString;
_logger = logger;
}
public async Task<RouteEntity?> GetByIdAsync(Guid id)
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
SELECT id, name, description, region_size_meters as RegionSizeMeters,
zoom_level as ZoomLevel, total_distance_meters as TotalDistanceMeters,
total_points as TotalPoints, request_maps as RequestMaps,
maps_ready as MapsReady, create_tiles_zip as CreateTilesZip,
csv_file_path as CsvFilePath,
summary_file_path as SummaryFilePath, stitched_image_path as StitchedImagePath,
tiles_zip_path as TilesZipPath,
created_at as CreatedAt, updated_at as UpdatedAt
FROM routes
const string sql = $@"
SELECT {ColumnList}
FROM routes
WHERE id = @Id";
return await connection.QuerySingleOrDefaultAsync<RouteEntity>(sql, new { Id = id });
@@ -146,16 +145,9 @@ public class RouteRepository : IRouteRepository
public async Task<IEnumerable<RouteEntity>> GetRoutesWithPendingMapsAsync()
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
SELECT id, name, description, region_size_meters as RegionSizeMeters,
zoom_level as ZoomLevel, total_distance_meters as TotalDistanceMeters,
total_points as TotalPoints, request_maps as RequestMaps,
maps_ready as MapsReady, create_tiles_zip as CreateTilesZip,
csv_file_path as CsvFilePath,
summary_file_path as SummaryFilePath, stitched_image_path as StitchedImagePath,
tiles_zip_path as TilesZipPath,
created_at as CreatedAt, updated_at as UpdatedAt
FROM routes
const string sql = $@"
SELECT {ColumnList}
FROM routes
WHERE request_maps = true AND maps_ready = false";
return await connection.QueryAsync<RouteEntity>(sql);
@@ -185,4 +177,3 @@ public class RouteRepository : IRouteRepository
return grouped;
}
}
@@ -1,3 +1,4 @@
using System.Diagnostics;
using Dapper;
using Microsoft.Extensions.Logging;
using Npgsql;
@@ -7,6 +8,14 @@ namespace SatelliteProvider.DataAccess.Repositories;
public class TileRepository : ITileRepository
{
private const int SlowQueryThresholdMs = 500;
private const string ColumnList = @"id, tile_zoom as TileZoom, tile_x as TileX, tile_y as TileY,
latitude, longitude,
tile_size_meters as TileSizeMeters, tile_size_pixels as TileSizePixels,
image_type as ImageType, maps_version as MapsVersion, version,
file_path as FilePath, created_at as CreatedAt, updated_at as UpdatedAt";
private readonly string _connectionString;
private readonly ILogger<TileRepository> _logger;
@@ -19,13 +28,9 @@ public class TileRepository : ITileRepository
public async Task<TileEntity?> GetByIdAsync(Guid id)
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
SELECT id, tile_zoom as TileZoom, tile_x as TileX, tile_y as TileY,
latitude, longitude,
tile_size_meters as TileSizeMeters, tile_size_pixels as TileSizePixels,
image_type as ImageType, maps_version as MapsVersion, version,
file_path as FilePath, created_at as CreatedAt, updated_at as UpdatedAt
FROM tiles
const string sql = $@"
SELECT {ColumnList}
FROM tiles
WHERE id = @Id";
return await connection.QuerySingleOrDefaultAsync<TileEntity>(sql, new { Id = id });
@@ -34,13 +39,9 @@ public class TileRepository : ITileRepository
public async Task<TileEntity?> GetByTileCoordinatesAsync(int tileZoom, int tileX, int tileY)
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
SELECT id, tile_zoom as TileZoom, tile_x as TileX, tile_y as TileY,
latitude, longitude,
tile_size_meters as TileSizeMeters, tile_size_pixels as TileSizePixels,
image_type as ImageType, maps_version as MapsVersion, version,
file_path as FilePath, created_at as CreatedAt, updated_at as UpdatedAt
FROM tiles
const string sql = $@"
SELECT {ColumnList}
FROM tiles
WHERE tile_zoom = @TileZoom AND tile_x = @TileX AND tile_y = @TileY
ORDER BY updated_at DESC
LIMIT 1";
@@ -48,33 +49,6 @@ public class TileRepository : ITileRepository
return await connection.QuerySingleOrDefaultAsync<TileEntity>(sql, new { TileZoom = tileZoom, TileX = tileX, TileY = tileY });
}
public async Task<TileEntity?> FindExistingTileAsync(double latitude, double longitude, double tileSizeMeters, int zoomLevel, int version)
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
SELECT id, tile_zoom as TileZoom, tile_x as TileX, tile_y as TileY,
latitude, longitude,
tile_size_meters as TileSizeMeters, tile_size_pixels as TileSizePixels,
image_type as ImageType, maps_version as MapsVersion, version,
file_path as FilePath, created_at as CreatedAt, updated_at as UpdatedAt
FROM tiles
WHERE ABS(latitude - @Latitude) < 0.0001
AND ABS(longitude - @Longitude) < 0.0001
AND ABS(tile_size_meters - @TileSizeMeters) < 1
AND tile_zoom = @TileZoom
AND version = @Version
LIMIT 1";
return await connection.QuerySingleOrDefaultAsync<TileEntity>(sql, new
{
Latitude = latitude,
Longitude = longitude,
TileSizeMeters = tileSizeMeters,
TileZoom = zoomLevel,
Version = version
});
}
public async Task<IEnumerable<TileEntity>> GetTilesByRegionAsync(double latitude, double longitude, double sizeMeters, int zoomLevel)
{
using var connection = new NpgsqlConnection(_connectionString);
@@ -90,19 +64,16 @@ public class TileRepository : ITileRepository
var latRange = expandedSizeMeters / 111000.0;
var lonRange = expandedSizeMeters / (111000.0 * Math.Cos(latitude * Math.PI / 180.0));
const string sql = @"
SELECT id, tile_zoom as TileZoom, tile_x as TileX, tile_y as TileY,
latitude, longitude,
tile_size_meters as TileSizeMeters, tile_size_pixels as TileSizePixels,
image_type as ImageType, maps_version as MapsVersion, version,
file_path as FilePath, created_at as CreatedAt, updated_at as UpdatedAt
FROM tiles
const string sql = $@"
SELECT {ColumnList}
FROM tiles
WHERE latitude BETWEEN @MinLat AND @MaxLat
AND longitude BETWEEN @MinLon AND @MaxLon
AND tile_zoom = @TileZoom
ORDER BY latitude DESC, longitude ASC, updated_at DESC";
return await connection.QueryAsync<TileEntity>(sql, new
var stopwatch = Stopwatch.StartNew();
var tiles = await connection.QueryAsync<TileEntity>(sql, new
{
MinLat = latitude - latRange / 2,
MaxLat = latitude + latRange / 2,
@@ -110,6 +81,16 @@ public class TileRepository : ITileRepository
MaxLon = longitude + lonRange / 2,
TileZoom = zoomLevel
});
stopwatch.Stop();
if (stopwatch.ElapsedMilliseconds > SlowQueryThresholdMs)
{
_logger.LogWarning(
"Slow GetTilesByRegionAsync: {ElapsedMs} ms (threshold {ThresholdMs} ms) for lat={Latitude}, lon={Longitude}, sizeMeters={SizeMeters}, zoom={ZoomLevel}",
stopwatch.ElapsedMilliseconds, SlowQueryThresholdMs, latitude, longitude, sizeMeters, zoomLevel);
}
return tiles;
}
public async Task<Guid> InsertAsync(TileEntity tile)