Merge main into develop

Resolved merge conflicts in multiple files:
- lib/wanderer_app/application.ex: merged kills service config logic
- lib/wanderer_app/map/map_audit.ex: kept security audit functionality
- lib/wanderer_app/map/operations/connections.ex: preserved time_status support
- lib/wanderer_app/map/operations/owner.ex: kept type guard for map_id
- lib/wanderer_app/map/operations/structures.ex: preserved structure type handling
- lib/wanderer_app/map/operations/systems.ex: unified system creation approach
- lib/wanderer_app_web/controllers/map_connection_api_controller.ex: kept time_status in allowed fields
- lib/wanderer_app_web/controllers/map_system_api_controller.ex: unified delete approach
- lib/wanderer_app_web/controllers/plugs/check_map_api_key.ex: kept owner character fetching
- test/unit/kills_storage_test.exs: unified test approach for killmail handling
- test/unit/character_api_controller_test.exs: removed as intended

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
guarzo
2025-07-17 23:19:18 +00:00
56 changed files with 1457 additions and 404 deletions

View File

@@ -569,9 +569,8 @@ defmodule WandererAppWeb.MapSystemAPIController do
)
def delete_single(conn, %{"id" => id}) do
with {:ok, system_uuid} <- APIUtils.validate_uuid(id),
{:ok, system} <- WandererApp.Api.MapSystem.by_id(system_uuid),
{:ok, _} <- Ash.destroy(system) do
with {:ok, sid} <- APIUtils.parse_int(id),
{:ok, _} <- Operations.delete_system(conn, sid) do
APIUtils.respond_data(conn, %{deleted: true})
else
{:error, :not_found} ->