Compare commits

..

5 Commits

Author SHA1 Message Date
Dmitry Popov
33bbb3425c Merge pull request #579 from guarzo/guarzo/apidev
Some checks failed
Build Test / 🚀 Deploy to test env (fly.io) (push) Has been cancelled
Build Test / 🛠 Build (1.17, 18.x, 27) (push) Has been cancelled
Build Develop / 🛠 Build (1.17, 18.x, 27) (push) Has been cancelled
🧪 Test Suite / Test Suite (push) Has been cancelled
Build Develop / 🛠 Build Docker Images (linux/amd64) (push) Has been cancelled
Build Develop / 🛠 Build Docker Images (linux/arm64) (push) Has been cancelled
Build Develop / merge (push) Has been cancelled
Build Develop / 🏷 Notify about develop release (push) Has been cancelled
fix: api updates and linked sig addition
2026-01-21 00:04:01 +04:00
Guarzo
a919bd9038 fix: api updates and linked sig addition 2026-01-20 17:55:30 +00:00
Dmitry Popov
8ae34cd94a Merge pull request #577 from guarzo/guarzo/apisigfixes
Some checks failed
Build Test / 🚀 Deploy to test env (fly.io) (push) Has been cancelled
Build Test / 🛠 Build (1.17, 18.x, 27) (push) Has been cancelled
Build Develop / 🛠 Build (1.17, 18.x, 27) (push) Has been cancelled
🧪 Test Suite / Test Suite (push) Has been cancelled
Build Develop / 🛠 Build Docker Images (linux/amd64) (push) Has been cancelled
Build Develop / 🛠 Build Docker Images (linux/arm64) (push) Has been cancelled
Build Develop / merge (push) Has been cancelled
Build Develop / 🏷 Notify about develop release (push) Has been cancelled
fix: api fixes and format
2026-01-16 16:06:34 +04:00
Guarzo
2f38da52e8 fix: api fixes and format 2026-01-16 08:39:19 +00:00
CI
89d7df0ba2 chore: [skip ci] 2026-01-14 22:29:39 +00:00
17 changed files with 434 additions and 47 deletions

View File

@@ -123,7 +123,8 @@ defmodule WandererApp.Api.MapSystemSignature do
:group,
:type,
:custom_info,
:deleted
:deleted,
:linked_system_id
]
end

View File

@@ -152,7 +152,8 @@ defmodule WandererApp.Map.Manager do
"[cleanup_orphaned_pings] Found #{length(orphaned_pings)} orphaned pings, cleaning up..."
)
Enum.each(orphaned_pings, fn %{id: ping_id, map_id: map_id, type: type, system: system} = ping ->
Enum.each(orphaned_pings, fn %{id: ping_id, map_id: map_id, type: type, system: system} =
ping ->
reason =
cond do
is_nil(ping.system) -> "system deleted"
@@ -178,7 +179,10 @@ defmodule WandererApp.Map.Manager do
Ash.destroy!(ping)
end)
Logger.info("[cleanup_orphaned_pings] Cleaned up #{length(orphaned_pings)} orphaned pings")
Logger.info(
"[cleanup_orphaned_pings] Cleaned up #{length(orphaned_pings)} orphaned pings"
)
:ok
{:error, error} ->

View File

@@ -126,4 +126,12 @@ defmodule WandererApp.Map.Operations do
@doc "Delete a signature in a map"
@spec delete_signature(String.t(), String.t()) :: :ok | {:error, String.t()}
defdelegate delete_signature(map_id, sig_id), to: Signatures
@doc "Link a signature to a target system"
@spec link_signature(Plug.Conn.t(), String.t(), map()) :: {:ok, map()} | {:error, atom()}
defdelegate link_signature(conn, sig_id, params), to: Signatures
@doc "Unlink a signature from its target system"
@spec unlink_signature(Plug.Conn.t(), String.t()) :: {:ok, map()} | {:error, atom()}
defdelegate unlink_signature(conn, sig_id), to: Signatures
end

View File

@@ -63,13 +63,31 @@ defmodule WandererApp.Map.Operations.Connections do
if is_nil(src_info) or is_nil(tgt_info) do
{:error, :invalid_system_info}
else
# Get wormhole_type for ship size inference
wormhole_type = attrs["wormhole_type"]
# Build extra_info map with optional connection attributes
extra_info =
%{}
|> maybe_add_extra("time_status", attrs["time_status"])
|> maybe_add_extra("mass_status", attrs["mass_status"])
|> maybe_add_extra("locked", attrs["locked"])
|> maybe_add_extra("wormhole_type", wormhole_type)
info = %{
solar_system_source_id: src_info.solar_system_id,
solar_system_target_id: tgt_info.solar_system_id,
character_id: char_id,
type: parse_type(attrs["type"]),
ship_size_type:
resolve_ship_size(attrs["type"], attrs["ship_size_type"], src_info, tgt_info)
resolve_ship_size(
attrs["type"],
attrs["ship_size_type"],
wormhole_type,
src_info,
tgt_info
),
extra_info: if(extra_info == %{}, do: nil, else: extra_info)
}
case Server.add_connection(map_id, info) do
@@ -95,10 +113,11 @@ defmodule WandererApp.Map.Operations.Connections do
# Determines the ship size for a connection, applying wormhole-specific rules
# for C1, C13, and C4⇄NS links, falling back to the caller's provided size or Large.
defp resolve_ship_size(type_val, ship_size_val, src_info, tgt_info) do
# If wormhole_type is provided (e.g., "H296"), infer ship size from it.
defp resolve_ship_size(type_val, ship_size_val, wormhole_type, src_info, tgt_info) do
case parse_type(type_val) do
@connection_type_wormhole ->
wormhole_ship_size(ship_size_val, src_info, tgt_info)
wormhole_ship_size(ship_size_val, wormhole_type, src_info, tgt_info)
_other ->
# Stargates and others just use the parsed or default size
@@ -108,15 +127,45 @@ defmodule WandererApp.Map.Operations.Connections do
# -- Wormholespecific sizing rules ----------------------------------------
defp wormhole_ship_size(ship_size_val, src, tgt) do
defp wormhole_ship_size(ship_size_val, wormhole_type, src, tgt) do
# First, try to infer from wormhole_type (e.g., "H296", "C5", etc.)
inferred_size = infer_ship_size_from_wormhole_type(wormhole_type)
# Parse ship_size_val early to handle string values correctly
parsed_ship_size = parse_ship_size(ship_size_val, nil)
cond do
c1_system?(src, tgt) -> @medium_ship_size
c13_system?(src, tgt) -> @small_ship_size
c4_to_ns?(src, tgt) -> @small_ship_size
true -> parse_ship_size(ship_size_val, @large_ship_size)
# If user explicitly provided a ship_size_val, use it
not is_nil(parsed_ship_size) ->
parsed_ship_size
# If we could infer from wormhole_type, use that
not is_nil(inferred_size) ->
inferred_size
# Otherwise fall back to system class rules
c1_system?(src, tgt) ->
@medium_ship_size
c13_system?(src, tgt) ->
@small_ship_size
c4_to_ns?(src, tgt) ->
@small_ship_size
true ->
@large_ship_size
end
end
# Infer ship size from wormhole type name using EVE static data
defp infer_ship_size_from_wormhole_type(nil), do: nil
defp infer_ship_size_from_wormhole_type(""), do: nil
defp infer_ship_size_from_wormhole_type("K162"), do: nil
defp infer_ship_size_from_wormhole_type(wormhole_type) do
WandererApp.Utils.EVEUtil.get_wh_size(wormhole_type)
end
defp c1_system?(%{system_class: @c1_system_class}, _), do: true
defp c1_system?(_, %{system_class: @c1_system_class}), do: true
defp c1_system?(_, _), do: false
@@ -162,6 +211,9 @@ defmodule WandererApp.Map.Operations.Connections do
defp parse_type(_), do: @connection_type_wormhole
defp maybe_add_extra(map, _key, nil), do: map
defp maybe_add_extra(map, key, value), do: Map.put(map, key, value)
defp parse_int(nil, field), do: {:error, {:missing_field, field}}
defp parse_int(val, _) when is_integer(val), do: {:ok, val}

View File

@@ -7,6 +7,7 @@ defmodule WandererApp.Map.Operations.Signatures do
alias WandererApp.Map.Operations
alias WandererApp.Api.{Character, MapSystem, MapSystemSignature}
alias WandererApp.Map.Server
alias WandererApp.Utils.EVEUtil
@spec validate_character_eve_id(map() | nil, String.t()) ::
{:ok, String.t()} | {:error, :invalid_character} | {:error, :unexpected_error}
@@ -79,7 +80,10 @@ defmodule WandererApp.Map.Operations.Signatures do
when is_integer(solar_system_id) do
with {:ok, validated_char_uuid} <- validate_character_eve_id(params, char_id),
{:ok, system} <-
MapSystem.read_by_map_and_solar_system(%{map_id: map_id, solar_system_id: solar_system_id}) do
MapSystem.read_by_map_and_solar_system(%{
map_id: map_id,
solar_system_id: solar_system_id
}) do
attrs =
params
|> Map.put("system_id", system.id)
@@ -249,4 +253,161 @@ defmodule WandererApp.Map.Operations.Signatures do
end
def delete_signature(_conn, _sig_id), do: {:error, :missing_params}
@doc """
Links a signature to a target system, creating the association between
the signature and the wormhole connection to that system.
This also:
- Updates the signature's group to "Wormhole"
- Sets the target system's linked_sig_eve_id
- Copies temporary_name from signature to target system
- Updates connection time_status and ship_size_type from signature data
"""
@spec link_signature(Plug.Conn.t(), String.t(), map()) :: {:ok, map()} | {:error, atom()}
def link_signature(
%{assigns: %{map_id: map_id}} = _conn,
sig_id,
%{"solar_system_target" => solar_system_target}
)
when is_integer(solar_system_target) do
with {:ok, signature} <- MapSystemSignature.by_id(sig_id),
{:ok, source_system} <- MapSystem.by_id(signature.system_id),
true <- source_system.map_id == map_id,
target_system when not is_nil(target_system) <-
WandererApp.Map.find_system_by_location(map_id, %{solar_system_id: solar_system_target}) do
# Update signature group to Wormhole and set linked_system_id
{:ok, updated_signature} =
signature
|> MapSystemSignature.update_group!(%{group: "Wormhole"})
|> MapSystemSignature.update_linked_system(%{linked_system_id: solar_system_target})
# Only update target system if it doesn't already have a linked signature
if is_nil(target_system.linked_sig_eve_id) do
# Set the target system's linked_sig_eve_id
Server.update_system_linked_sig_eve_id(map_id, %{
solar_system_id: solar_system_target,
linked_sig_eve_id: signature.eve_id
})
# Copy temporary_name if present
if not is_nil(signature.temporary_name) do
Server.update_system_temporary_name(map_id, %{
solar_system_id: solar_system_target,
temporary_name: signature.temporary_name
})
end
# Update connection time_status from signature custom_info
signature_time_status =
if not is_nil(signature.custom_info) do
case Jason.decode(signature.custom_info) do
{:ok, map} -> Map.get(map, "time_status")
{:error, _} -> nil
end
else
nil
end
if not is_nil(signature_time_status) do
Server.update_connection_time_status(map_id, %{
solar_system_source_id: source_system.solar_system_id,
solar_system_target_id: solar_system_target,
time_status: signature_time_status
})
end
# Update connection ship_size_type from signature wormhole type
signature_ship_size_type = EVEUtil.get_wh_size(signature.type)
if not is_nil(signature_ship_size_type) do
Server.update_connection_ship_size_type(map_id, %{
solar_system_source_id: source_system.solar_system_id,
solar_system_target_id: solar_system_target,
ship_size_type: signature_ship_size_type
})
end
end
# Broadcast update
Server.Impl.broadcast!(map_id, :signatures_updated, source_system.solar_system_id)
# Return the updated signature
result =
updated_signature
|> Map.from_struct()
|> Map.put(:solar_system_id, source_system.solar_system_id)
|> Map.drop([:system_id, :__meta__, :system, :aggregates, :calculations])
{:ok, result}
else
false ->
{:error, :not_found}
nil ->
{:error, :target_system_not_found}
{:error, %Ash.Error.Query.NotFound{}} ->
{:error, :not_found}
err ->
Logger.error("[link_signature] Unexpected error: #{inspect(err)}")
{:error, :unexpected_error}
end
end
def link_signature(_conn, _sig_id, %{"solar_system_target" => _}),
do: {:error, :invalid_solar_system_target}
def link_signature(_conn, _sig_id, _params), do: {:error, :missing_params}
@doc """
Unlinks a signature from its target system.
"""
@spec unlink_signature(Plug.Conn.t(), String.t()) :: {:ok, map()} | {:error, atom()}
def unlink_signature(%{assigns: %{map_id: map_id}} = _conn, sig_id) do
with {:ok, signature} <- MapSystemSignature.by_id(sig_id),
{:ok, source_system} <- MapSystem.by_id(signature.system_id),
:ok <- (if source_system.map_id == map_id, do: :ok, else: {:error, :not_found}),
:ok <- (if not is_nil(signature.linked_system_id), do: :ok, else: {:error, :not_linked}) do
# Clear the target system's linked_sig_eve_id
Server.update_system_linked_sig_eve_id(map_id, %{
solar_system_id: signature.linked_system_id,
linked_sig_eve_id: nil
})
# Clear the signature's linked_system_id using the wrapper for logging
{:ok, updated_signature} =
Server.SignaturesImpl.update_signature_linked_system(signature, %{
linked_system_id: nil
})
# Broadcast update
Server.Impl.broadcast!(map_id, :signatures_updated, source_system.solar_system_id)
# Return the updated signature
result =
updated_signature
|> Map.from_struct()
|> Map.put(:solar_system_id, source_system.solar_system_id)
|> Map.drop([:system_id, :__meta__, :system, :aggregates, :calculations])
{:ok, result}
else
{:error, :not_found} ->
{:error, :not_found}
{:error, :not_linked} ->
{:error, :not_linked}
{:error, %Ash.Error.Query.NotFound{}} ->
{:error, :not_found}
err ->
Logger.error("[unlink_signature] Unexpected error: #{inspect(err)}")
{:error, :unexpected_error}
end
end
def unlink_signature(_conn, _sig_id), do: {:error, :missing_params}
end

View File

@@ -200,16 +200,22 @@ defmodule WandererApp.Map.Operations.Systems do
defp normalize_coordinates(%{"coordinates" => %{"x" => x, "y" => y}})
when is_number(x) and is_number(y),
do: %{x: x, y: y}
do: %{"x" => x, "y" => y}
defp normalize_coordinates(%{coordinates: %{x: x, y: y}}) when is_number(x) and is_number(y),
do: %{x: x, y: y}
do: %{"x" => x, "y" => y}
defp normalize_coordinates(params) do
%{
x: params |> Map.get("position_x", Map.get(params, :position_x, 0)),
y: params |> Map.get("position_y", Map.get(params, :position_y, 0))
}
x = params |> Map.get("position_x", Map.get(params, :position_x))
y = params |> Map.get("position_y", Map.get(params, :position_y))
# Only return coordinates if both x and y are provided
# Otherwise return nil to let the server use auto-positioning
if is_number(x) and is_number(y) do
%{"x" => x, "y" => y}
else
nil
end
end
defp apply_system_updates(map_id, system_id, attrs, %{x: x, y: y}) do

View File

@@ -595,6 +595,7 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
time_status = get_extra_info(extra_info, "time_status", time_status)
mass_status = get_extra_info(extra_info, "mass_status", 0)
locked = get_extra_info(extra_info, "locked", false)
wormhole_type = get_extra_info(extra_info, "wormhole_type", nil)
{:ok, connection} =
WandererApp.MapConnectionRepo.create(%{
@@ -605,7 +606,8 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
ship_size_type: ship_size_type,
time_status: time_status,
mass_status: mass_status,
locked: locked
locked: locked,
wormhole_type: wormhole_type
})
if connection_type == @connection_type_wormhole do
@@ -915,8 +917,10 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
if not from_is_wormhole and not to_is_wormhole do
# Check if there's a known stargate
case find_solar_system_jump(from_solar_system_id, to_solar_system_id) do
{:ok, []} -> true # No stargate = wormhole connection
_ -> false # Stargate exists or error
# No stargate = wormhole connection
{:ok, []} -> true
# Stargate exists or error
_ -> false
end
else
false

View File

@@ -72,7 +72,6 @@ defmodule WandererApp.Map.Server.PingsImpl do
type: type
} = _ping_info
) do
result = WandererApp.MapPingsRepo.get_by_id(ping_id)
case result do

View File

@@ -327,6 +327,7 @@ defmodule WandererApp.Map.Server.SignaturesImpl do
group: sig["group"],
type: Map.get(sig, "type"),
custom_info: Map.get(sig, "custom_info"),
linked_system_id: Map.get(sig, "linked_system_id"),
# Use character_eve_id from sig if provided, otherwise use the default
character_eve_id: Map.get(sig, "character_eve_id", character_eve_id),
deleted: false

View File

@@ -41,14 +41,18 @@
<div class="absolute rounded-m top-0 left-0 w-full h-full bg-gradient-to-b from-transparent to-black opacity-75 group-hover:opacity-25 transition-opacity duration-300">
</div>
<div class="absolute w-full bottom-2 p-4">
<% {first_part, second_part} = case String.split(post.title, ":", parts: 2) do
[first, second] -> {first, second}
[first] -> {first, nil}
end %>
<% {first_part, second_part} =
case String.split(post.title, ":", parts: 2) do
[first, second] -> {first, second}
[first] -> {first, nil}
end %>
<h3 class="!m-0 !text-s font-bold break-normal ccp-font whitespace-nowrap text-white">
{first_part}
</h3>
<p :if={second_part} class="!m-0 !text-s text-white text-ellipsis overflow-hidden whitespace-nowrap ccp-font">
<p
:if={second_part}
class="!m-0 !text-s text-white text-ellipsis overflow-hidden whitespace-nowrap ccp-font"
>
{second_part}
</p>
</div>

View File

@@ -487,10 +487,17 @@ defmodule WandererAppWeb.MapSystemAPIController do
)
def create(conn, params) do
# Support both batch format {"systems": [...], "connections": [...]}
# and single system format {"solar_system_id": ..., ...}
# Support multiple formats:
# 1. Batch format: {"systems": [...], "connections": [...]}
# 2. Wrapped batch format: {"data": {"systems": [...], "connections": [...]}}
# 3. Single system format: {"solar_system_id": ..., ...}
{systems, connections} =
cond do
Map.has_key?(params, "data") and is_map(params["data"]) ->
# Wrapped batch format - extract from data wrapper
data = params["data"]
{Map.get(data, "systems", []), Map.get(data, "connections", [])}
Map.has_key?(params, "systems") ->
# Batch format
{Map.get(params, "systems", []), Map.get(params, "connections", [])}

View File

@@ -311,4 +311,117 @@ defmodule WandererAppWeb.MapSystemSignatureAPIController do
{:error, error} -> conn |> put_status(:unprocessable_entity) |> json(%{error: error})
end
end
@doc """
Link a signature to a target system.
This creates the association between a wormhole signature and the system it leads to.
It also updates the connection's time_status and ship_size_type based on the signature data.
"""
operation(:link,
summary: "Link a signature to a target system",
description: """
Links a wormhole signature to its destination system. This operation:
- Sets the signature's linked_system_id to the target system
- Updates the signature's group to "Wormhole"
- Sets the target system's linked_sig_eve_id (if not already set)
- Copies temporary_name from signature to target system
- Updates the connection's time_status and ship_size_type from signature data
""",
parameters: [
map_identifier: [
in: :path,
description: "Map identifier (UUID or slug)",
type: :string,
required: true
],
id: [in: :path, description: "Signature UUID", type: :string, required: true]
],
request_body:
{"Link request", "application/json",
%OpenApiSpex.Schema{
type: :object,
properties: %{
solar_system_target: %OpenApiSpex.Schema{
type: :integer,
description: "Target solar system ID to link to"
}
},
required: [:solar_system_target],
example: %{solar_system_target: 31_001_922}
}},
responses: [
ok:
{"Linked signature", "application/json",
%OpenApiSpex.Schema{
type: :object,
properties: %{data: @signature_schema},
example: %{data: @signature_schema.example}
}},
unprocessable_entity:
{"Error", "application/json",
%OpenApiSpex.Schema{
type: :object,
properties: %{
error: %OpenApiSpex.Schema{
type: :string,
description: "Error type"
}
},
example: %{error: "target_system_not_found"}
}}
]
)
def link(conn, %{"id" => id} = params) do
case MapOperations.link_signature(conn, id, params) do
{:ok, sig} -> json(conn, %{data: sig})
{:error, error} -> conn |> put_status(:unprocessable_entity) |> json(%{error: error})
end
end
@doc """
Unlink a signature from its target system.
"""
operation(:unlink,
summary: "Unlink a signature from its target system",
description: "Removes the link between a signature and its destination system.",
parameters: [
map_identifier: [
in: :path,
description: "Map identifier (UUID or slug)",
type: :string,
required: true
],
id: [in: :path, description: "Signature UUID", type: :string, required: true]
],
responses: [
ok:
{"Unlinked signature", "application/json",
%OpenApiSpex.Schema{
type: :object,
properties: %{data: @signature_schema},
example: %{data: Map.put(@signature_schema.example, :linked_system_id, nil)}
}},
unprocessable_entity:
{"Error", "application/json",
%OpenApiSpex.Schema{
type: :object,
properties: %{
error: %OpenApiSpex.Schema{
type: :string,
description: "Error type"
}
},
example: %{error: "not_linked"}
}}
]
)
def unlink(conn, %{"id" => id}) do
case MapOperations.unlink_signature(conn, id) do
{:ok, sig} -> json(conn, %{data: sig})
{:error, error} -> conn |> put_status(:unprocessable_entity) |> json(%{error: error})
end
end
end

View File

@@ -34,7 +34,9 @@
<.icon name="hero-gift-solid" class="w-4 h-4 text-green-400 flex-shrink-0" />
<span class="text-sm text-gray-300">
Support development by using promocode
<code class="ml-1 px-1.5 py-0.5 bg-stone-800 rounded text-green-400 text-xs font-mono">WANDERER</code>
<code class="ml-1 px-1.5 py-0.5 bg-stone-800 rounded text-green-400 text-xs font-mono">
WANDERER
</code>
<span class="ml-1">at official</span>
</span>
<a

View File

@@ -299,6 +299,8 @@ defmodule WandererAppWeb.Router do
resources "/structures", MapSystemStructureAPIController, except: [:new, :edit]
get "/structure-timers", MapSystemStructureAPIController, :structure_timers
resources "/signatures", MapSystemSignatureAPIController, except: [:new, :edit]
post "/signatures/:id/link", MapSystemSignatureAPIController, :link
delete "/signatures/:id/link", MapSystemSignatureAPIController, :unlink
get "/user-characters", MapAPIController, :show_user_characters
get "/tracked-characters", MapAPIController, :show_tracked_characters
end

View File

@@ -26,9 +26,9 @@ defmodule WandererApp.Map.CorporationChangePermissionTest do
setup :verify_on_exit!
@test_corp_id_a 98000001
@test_corp_id_b 98000002
@test_alliance_id_a 99000001
@test_corp_id_a 98_000_001
@test_corp_id_b 98_000_002
@test_alliance_id_a 99_000_001
setup do
# Configure the PubSubMock to forward to real Phoenix.PubSub for broadcast testing
@@ -70,7 +70,8 @@ defmodule WandererApp.Map.CorporationChangePermissionTest do
simulate_corporation_change(character, @test_corp_id_b)
# Should receive :update_permissions broadcast
assert_receive :update_permissions, 1000,
assert_receive :update_permissions,
1000,
"Should receive :update_permissions when corporation changes"
end
@@ -94,7 +95,8 @@ defmodule WandererApp.Map.CorporationChangePermissionTest do
simulate_alliance_removal(character)
# Should receive :update_permissions broadcast
assert_receive :update_permissions, 1000,
assert_receive :update_permissions,
1000,
"Should receive :update_permissions when alliance is removed"
end
end

View File

@@ -116,6 +116,7 @@ defmodule WandererApp.Map.Server.AclScopesPropagationTest do
# Fetch again to confirm persistence
{:ok, refetched_map} = WandererApp.MapRepo.get(map.id, [])
assert refetched_map.scopes == [:wormholes, :hi, :low, :null],
"Refetched map should have updated scopes"
end

View File

@@ -577,35 +577,55 @@ defmodule WandererApp.Map.Server.MapScopesTest do
# All should be valid because no stargates exist in test data = wormhole connections
# Hi-Sec combinations
assert ConnectionsImpl.is_connection_valid([:wormholes], @hs_system_id, @ls_system_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @hs_system_id, @ls_system_id) ==
true,
"Hi->Low should be valid"
assert ConnectionsImpl.is_connection_valid([:wormholes], @hs_system_id, @ns_system_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @hs_system_id, @ns_system_id) ==
true,
"Hi->Null should be valid"
assert ConnectionsImpl.is_connection_valid([:wormholes], @hs_system_id, @pochven_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @hs_system_id, @pochven_id) ==
true,
"Hi->Pochven should be valid"
# Low-Sec combinations
assert ConnectionsImpl.is_connection_valid([:wormholes], @ls_system_id, @hs_system_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @ls_system_id, @hs_system_id) ==
true,
"Low->Hi should be valid"
assert ConnectionsImpl.is_connection_valid([:wormholes], @ls_system_id, @ns_system_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @ls_system_id, @ns_system_id) ==
true,
"Low->Null should be valid"
assert ConnectionsImpl.is_connection_valid([:wormholes], @ls_system_id, @pochven_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @ls_system_id, @pochven_id) ==
true,
"Low->Pochven should be valid"
# Null-Sec combinations
assert ConnectionsImpl.is_connection_valid([:wormholes], @ns_system_id, @hs_system_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @ns_system_id, @hs_system_id) ==
true,
"Null->Hi should be valid"
assert ConnectionsImpl.is_connection_valid([:wormholes], @ns_system_id, @ls_system_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @ns_system_id, @ls_system_id) ==
true,
"Null->Low should be valid"
assert ConnectionsImpl.is_connection_valid([:wormholes], @ns_system_id, @pochven_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @ns_system_id, @pochven_id) ==
true,
"Null->Pochven should be valid"
# Pochven combinations
assert ConnectionsImpl.is_connection_valid([:wormholes], @pochven_id, @hs_system_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @pochven_id, @hs_system_id) ==
true,
"Pochven->Hi should be valid"
assert ConnectionsImpl.is_connection_valid([:wormholes], @pochven_id, @ls_system_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @pochven_id, @ls_system_id) ==
true,
"Pochven->Low should be valid"
assert ConnectionsImpl.is_connection_valid([:wormholes], @pochven_id, @ns_system_id) == true,
assert ConnectionsImpl.is_connection_valid([:wormholes], @pochven_id, @ns_system_id) ==
true,
"Pochven->Null should be valid"
end
end