mirror of
https://github.com/azaion/satellite-provider.git
synced 2026-06-21 10:01:14 +00:00
6099d1c86b
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>
262 lines
10 KiB
C#
262 lines
10 KiB
C#
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.OpenApi.Models;
|
|
using Swashbuckle.AspNetCore.SwaggerGen;
|
|
using SatelliteProvider.Api;
|
|
using SatelliteProvider.Api.DTOs;
|
|
using SatelliteProvider.Api.Swagger;
|
|
using SatelliteProvider.DataAccess;
|
|
using SatelliteProvider.DataAccess.Repositories;
|
|
using SatelliteProvider.DataAccess.TypeHandlers;
|
|
using SatelliteProvider.Common.Configs;
|
|
using SatelliteProvider.Common.DTO;
|
|
using SatelliteProvider.Common.Interfaces;
|
|
using SatelliteProvider.Services.RegionProcessing;
|
|
using SatelliteProvider.Services.RouteManagement;
|
|
using SatelliteProvider.Services.TileDownloader;
|
|
using Serilog;
|
|
|
|
var builder = WebApplication.CreateBuilder(args);
|
|
|
|
builder.Host.UseSerilog((context, configuration) =>
|
|
configuration.ReadFrom.Configuration(context.Configuration));
|
|
|
|
var connectionString = builder.Configuration.GetConnectionString("DefaultConnection")
|
|
?? throw new InvalidOperationException("Connection string 'DefaultConnection' not found.");
|
|
|
|
DapperEnumTypeHandlers.RegisterAll();
|
|
|
|
builder.Services.Configure<MapConfig>(builder.Configuration.GetSection("MapConfig"));
|
|
builder.Services.Configure<StorageConfig>(builder.Configuration.GetSection("StorageConfig"));
|
|
builder.Services.Configure<ProcessingConfig>(builder.Configuration.GetSection("ProcessingConfig"));
|
|
|
|
builder.Services.AddSingleton<ITileRepository>(sp => new TileRepository(connectionString, sp.GetRequiredService<ILogger<TileRepository>>()));
|
|
builder.Services.AddSingleton<IRegionRepository>(sp => new RegionRepository(connectionString));
|
|
builder.Services.AddSingleton<IRouteRepository>(sp => new RouteRepository(connectionString));
|
|
|
|
builder.Services.AddHttpClient();
|
|
|
|
builder.Services.AddTileDownloader();
|
|
builder.Services.AddRegionProcessing();
|
|
builder.Services.AddRouteManagement();
|
|
|
|
var allowedOrigins = builder.Configuration.GetSection("CorsConfig:AllowedOrigins").Get<string[]>() ?? Array.Empty<string>();
|
|
var allowAnyOrigin = builder.Configuration.GetValue<bool>("CorsConfig:AllowAnyOrigin");
|
|
CorsConfigurationValidator.EnsureSafeForEnvironment(allowedOrigins, allowAnyOrigin, builder.Environment.EnvironmentName);
|
|
|
|
builder.Services.AddCors(options =>
|
|
{
|
|
options.AddPolicy("TilesCors", policy =>
|
|
{
|
|
if (CorsConfigurationValidator.ShouldUsePermissivePolicy(allowedOrigins, allowAnyOrigin))
|
|
policy.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod();
|
|
else
|
|
policy.WithOrigins(allowedOrigins).AllowAnyHeader().AllowAnyMethod();
|
|
});
|
|
});
|
|
|
|
builder.Services.AddProblemDetails();
|
|
builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
|
|
|
|
builder.Services.ConfigureHttpJsonOptions(options =>
|
|
{
|
|
options.SerializerOptions.PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase;
|
|
options.SerializerOptions.PropertyNameCaseInsensitive = true;
|
|
options.SerializerOptions.Converters.Add(
|
|
new System.Text.Json.Serialization.JsonStringEnumConverter(System.Text.Json.JsonNamingPolicy.CamelCase));
|
|
});
|
|
|
|
builder.Services.AddEndpointsApiExplorer();
|
|
builder.Services.AddSwaggerGen(c =>
|
|
{
|
|
c.SwaggerDoc("v1", new OpenApiInfo { Title = "Satellite Provider API", Version = "v1" });
|
|
|
|
c.MapType<UploadImageRequest>(() => new OpenApiSchema
|
|
{
|
|
Type = "object",
|
|
Properties = new Dictionary<string, OpenApiSchema>
|
|
{
|
|
["timestamp"] = new() { Type = "string", Format = "date-time", Description = "Image capture timestamp" },
|
|
["image"] = new() { Type = "string", Format = "binary", Description = "Image file to upload" },
|
|
["lat"] = new() { Type = "number", Format = "double", Description = "Latitude coordinate where image was captured" },
|
|
["lon"] = new() { Type = "number", Format = "double", Description = "Longitude coordinate where image was captured" },
|
|
["height"] = new() { Type = "number", Format = "double", Description = "Height/altitude in meters where image was captured" },
|
|
["focalLength"] = new() { Type = "number", Format = "double", Description = "Camera focal length in millimeters" },
|
|
["sensorWidth"] = new() { Type = "number", Format = "double", Description = "Camera sensor width in millimeters" },
|
|
["sensorHeight"] = new() { Type = "number", Format = "double", Description = "Camera sensor height in millimeters" }
|
|
},
|
|
Required = new HashSet<string> { "timestamp", "image", "lat", "lon", "height", "focalLength", "sensorWidth", "sensorHeight" }
|
|
});
|
|
|
|
c.OperationFilter<ParameterDescriptionFilter>();
|
|
});
|
|
|
|
var app = builder.Build();
|
|
|
|
if (CorsConfigurationValidator.ShouldWarnAboutPermissiveDefault(allowedOrigins, allowAnyOrigin))
|
|
{
|
|
app.Services
|
|
.GetRequiredService<ILogger<Program>>()
|
|
.LogWarning(CorsConfigurationValidator.PermissiveDefaultWarning, app.Environment.EnvironmentName);
|
|
}
|
|
|
|
var migratorLogger = app.Services.GetRequiredService<ILogger<DatabaseMigrator>>();
|
|
var migrator = new DatabaseMigrator(connectionString, migratorLogger);
|
|
if (!migrator.RunMigrations())
|
|
{
|
|
throw new Exception("Database migration failed. Application cannot start.");
|
|
}
|
|
|
|
var storageConfig = app.Configuration.GetSection("StorageConfig").Get<StorageConfig>() ?? new StorageConfig();
|
|
Directory.CreateDirectory(storageConfig.TilesDirectory);
|
|
Directory.CreateDirectory(storageConfig.ReadyDirectory);
|
|
|
|
if (app.Environment.IsDevelopment())
|
|
{
|
|
app.UseSwagger();
|
|
app.UseSwaggerUI();
|
|
}
|
|
|
|
app.UseExceptionHandler();
|
|
app.UseHttpsRedirection();
|
|
app.UseCors("TilesCors");
|
|
|
|
app.MapGet("/tiles/{z:int}/{x:int}/{y:int}", ServeTile)
|
|
.WithOpenApi(op => new(op) { Summary = "Get satellite tile image by z/x/y coordinates (Slippy Map tile server)" });
|
|
|
|
app.MapGet("/api/satellite/tiles/latlon", GetTileByLatLon)
|
|
.WithOpenApi(op => new(op) { Summary = "Get satellite tile by latitude and longitude coordinates" });
|
|
|
|
app.MapGet("/api/satellite/tiles/mgrs", GetSatelliteTilesByMgrs)
|
|
.ProducesProblem(StatusCodes.Status501NotImplemented)
|
|
.WithOpenApi(op => new(op) { Summary = "Get satellite tiles by MGRS coordinates (NOT IMPLEMENTED)" });
|
|
|
|
app.MapPost("/api/satellite/upload", UploadImage)
|
|
.Accepts<UploadImageRequest>("multipart/form-data")
|
|
.ProducesProblem(StatusCodes.Status501NotImplemented)
|
|
.WithOpenApi(op => new(op) { Summary = "Upload image with metadata (NOT IMPLEMENTED)" })
|
|
.DisableAntiforgery();
|
|
|
|
app.MapPost("/api/satellite/request", RequestRegion)
|
|
.WithOpenApi(op => new(op)
|
|
{
|
|
Summary = "Request tiles for a region",
|
|
Description = "Idempotent (AZ-362): POSTing the same `id` twice returns the existing region resource with HTTP 200 and does not enqueue duplicate background processing.",
|
|
});
|
|
|
|
app.MapGet("/api/satellite/region/{id:guid}", GetRegionStatus)
|
|
.WithOpenApi(op => new(op) { Summary = "Get region status and file paths" });
|
|
|
|
app.MapPost("/api/satellite/route", CreateRoute)
|
|
.WithOpenApi(op => new(op)
|
|
{
|
|
Summary = "Create a route with intermediate points",
|
|
Description = "Idempotent (AZ-362): POSTing the same `id` twice returns the existing route resource with HTTP 200 and does not regenerate intermediate points or re-queue geofence regions.",
|
|
});
|
|
|
|
app.MapGet("/api/satellite/route/{id:guid}", GetRoute)
|
|
.WithOpenApi(op => new(op) { Summary = "Get route information with calculated points" });
|
|
|
|
app.Run();
|
|
|
|
async Task<IResult> ServeTile(int z, int x, int y, HttpContext httpContext, ITileService tileService)
|
|
{
|
|
var tile = await tileService.GetOrDownloadTileAsync(z, x, y, httpContext.RequestAborted);
|
|
httpContext.Response.Headers.CacheControl = $"public, max-age={(long)tile.MaxAge.TotalSeconds}";
|
|
httpContext.Response.Headers.ETag = tile.ETag;
|
|
return Results.Bytes(tile.Bytes, tile.ContentType);
|
|
}
|
|
|
|
async Task<IResult> GetTileByLatLon([FromQuery] double Latitude, [FromQuery] double Longitude, [FromQuery] int ZoomLevel, HttpContext httpContext, ITileService tileService)
|
|
{
|
|
var tile = await tileService.DownloadAndStoreSingleTileAsync(Latitude, Longitude, ZoomLevel, httpContext.RequestAborted);
|
|
|
|
var response = new DownloadTileResponse
|
|
{
|
|
Id = tile.Id,
|
|
ZoomLevel = tile.TileZoom,
|
|
Latitude = tile.Latitude,
|
|
Longitude = tile.Longitude,
|
|
TileSizeMeters = tile.TileSizeMeters,
|
|
TileSizePixels = tile.TileSizePixels,
|
|
ImageType = tile.ImageType,
|
|
Version = tile.Version,
|
|
FilePath = tile.FilePath,
|
|
CreatedAt = tile.CreatedAt,
|
|
UpdatedAt = tile.UpdatedAt
|
|
};
|
|
|
|
return Results.Ok(response);
|
|
}
|
|
|
|
IResult GetSatelliteTilesByMgrs(string mgrs, double squareSideMeters)
|
|
{
|
|
return Results.Problem(
|
|
statusCode: StatusCodes.Status501NotImplemented,
|
|
title: "Not implemented",
|
|
detail: "MGRS-based tile retrieval is not implemented.");
|
|
}
|
|
|
|
IResult UploadImage([FromForm] UploadImageRequest request)
|
|
{
|
|
return Results.Problem(
|
|
statusCode: StatusCodes.Status501NotImplemented,
|
|
title: "Not implemented",
|
|
detail: "Image upload is not implemented.");
|
|
}
|
|
|
|
async Task<IResult> RequestRegion([FromBody] RequestRegionRequest request, IRegionService regionService)
|
|
{
|
|
if (request.SizeMeters < 100 || request.SizeMeters > 10000)
|
|
{
|
|
return Results.BadRequest(new { error = "Size must be between 100 and 10000 meters" });
|
|
}
|
|
|
|
var status = await regionService.RequestRegionAsync(
|
|
request.Id,
|
|
request.Latitude,
|
|
request.Longitude,
|
|
request.SizeMeters,
|
|
request.ZoomLevel,
|
|
request.StitchTiles);
|
|
|
|
return Results.Ok(status);
|
|
}
|
|
|
|
async Task<IResult> GetRegionStatus(Guid id, IRegionService regionService)
|
|
{
|
|
var status = await regionService.GetRegionStatusAsync(id);
|
|
|
|
if (status == null)
|
|
{
|
|
return Results.NotFound(new { error = $"Region {id} not found" });
|
|
}
|
|
|
|
return Results.Ok(status);
|
|
}
|
|
|
|
async Task<IResult> CreateRoute([FromBody] CreateRouteRequest request, IRouteService routeService, ILogger<Program> logger)
|
|
{
|
|
try
|
|
{
|
|
var route = await routeService.CreateRouteAsync(request);
|
|
return Results.Ok(route);
|
|
}
|
|
catch (ArgumentException ex)
|
|
{
|
|
logger.LogWarning(ex, "Invalid route request");
|
|
return Results.BadRequest(new { error = ex.Message });
|
|
}
|
|
}
|
|
|
|
async Task<IResult> GetRoute(Guid id, IRouteService routeService)
|
|
{
|
|
var route = await routeService.GetRouteAsync(id);
|
|
|
|
if (route == null)
|
|
{
|
|
return Results.NotFound(new { error = $"Route {id} not found" });
|
|
}
|
|
|
|
return Results.Ok(route);
|
|
}
|