Client changes, admin portal, collection fixes.
This commit is contained in:
@@ -0,0 +1,195 @@
|
||||
extends Node
|
||||
## Local player-specific cache for collection payloads.
|
||||
##
|
||||
## Stored under:
|
||||
## user://collection/<player_id>/decks.json
|
||||
## user://collection/<player_id>/deck_<deck_id>.json
|
||||
## user://collection/<player_id>/cards_<query_hash>.json
|
||||
|
||||
const CACHE_ROOT := "user://collection"
|
||||
|
||||
var _loaded_player_id : String = ""
|
||||
var _cards_pages : Dictionary = {}
|
||||
var _decks_payload : Dictionary = {}
|
||||
var _deck_payloads : Dictionary = {}
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
_ensure_loaded()
|
||||
|
||||
|
||||
func cards_query_key(
|
||||
page: int,
|
||||
page_size: int,
|
||||
name_filter: String = "",
|
||||
card_type_filter: String = "",
|
||||
affinity_filter: String = "",
|
||||
tier_filter: Variant = null) -> String:
|
||||
var tier_text := ""
|
||||
if tier_filter != null:
|
||||
tier_text = str(tier_filter)
|
||||
return "p=%d|ps=%d|n=%s|t=%s|a=%s|tier=%s" % [
|
||||
page,
|
||||
page_size,
|
||||
name_filter,
|
||||
card_type_filter,
|
||||
affinity_filter,
|
||||
tier_text,
|
||||
]
|
||||
|
||||
|
||||
func get_cards_response(query_key: String) -> Dictionary:
|
||||
_ensure_loaded()
|
||||
if _loaded_player_id.is_empty():
|
||||
return {}
|
||||
if _cards_pages.has(query_key):
|
||||
var cached: Variant = _cards_pages.get(query_key, {})
|
||||
if typeof(cached) == TYPE_DICTIONARY:
|
||||
return (cached as Dictionary).duplicate(true)
|
||||
return {}
|
||||
|
||||
var path := _cards_file_path(query_key)
|
||||
var payload := _read_json_file(path)
|
||||
if not payload.is_empty():
|
||||
_cards_pages[query_key] = payload
|
||||
return payload.duplicate(true)
|
||||
return {}
|
||||
|
||||
|
||||
func store_cards_response(query_key: String, payload: Dictionary) -> void:
|
||||
_ensure_loaded()
|
||||
if _loaded_player_id.is_empty():
|
||||
return
|
||||
var copy := payload.duplicate(true)
|
||||
_cards_pages[query_key] = copy
|
||||
_write_json_file(_cards_file_path(query_key), copy)
|
||||
|
||||
|
||||
func get_decks_response() -> Dictionary:
|
||||
_ensure_loaded()
|
||||
if _loaded_player_id.is_empty():
|
||||
return {}
|
||||
if not _decks_payload.is_empty():
|
||||
return _decks_payload.duplicate(true)
|
||||
_decks_payload = _read_json_file(_decks_file_path())
|
||||
return _decks_payload.duplicate(true)
|
||||
|
||||
|
||||
func store_decks_response(payload: Dictionary) -> void:
|
||||
_ensure_loaded()
|
||||
if _loaded_player_id.is_empty():
|
||||
return
|
||||
_decks_payload = payload.duplicate(true)
|
||||
_write_json_file(_decks_file_path(), _decks_payload)
|
||||
|
||||
|
||||
func get_deck_response(deck_id: String) -> Dictionary:
|
||||
_ensure_loaded()
|
||||
if _loaded_player_id.is_empty() or deck_id.is_empty():
|
||||
return {}
|
||||
if _deck_payloads.has(deck_id):
|
||||
var cached: Variant = _deck_payloads.get(deck_id, {})
|
||||
if typeof(cached) == TYPE_DICTIONARY:
|
||||
return (cached as Dictionary).duplicate(true)
|
||||
return {}
|
||||
|
||||
var payload := _read_json_file(_deck_file_path(deck_id))
|
||||
if not payload.is_empty():
|
||||
_deck_payloads[deck_id] = payload
|
||||
return payload.duplicate(true)
|
||||
return {}
|
||||
|
||||
|
||||
func store_deck_response(deck_id: String, payload: Dictionary) -> void:
|
||||
_ensure_loaded()
|
||||
if _loaded_player_id.is_empty() or deck_id.is_empty():
|
||||
return
|
||||
var copy := payload.duplicate(true)
|
||||
_deck_payloads[deck_id] = copy
|
||||
_write_json_file(_deck_file_path(deck_id), copy)
|
||||
|
||||
|
||||
func remove_deck(deck_id: String) -> void:
|
||||
_ensure_loaded()
|
||||
if _loaded_player_id.is_empty() or deck_id.is_empty():
|
||||
return
|
||||
_deck_payloads.erase(deck_id)
|
||||
var path := _deck_file_path(deck_id)
|
||||
if FileAccess.file_exists(path):
|
||||
DirAccess.remove_absolute(path)
|
||||
|
||||
var decks_payload := get_decks_response()
|
||||
if decks_payload.is_empty():
|
||||
return
|
||||
|
||||
var decks_raw : Variant = decks_payload.get("decks", [])
|
||||
if typeof(decks_raw) != TYPE_ARRAY:
|
||||
return
|
||||
|
||||
var next_decks : Array = []
|
||||
for deck in decks_raw as Array:
|
||||
if typeof(deck) != TYPE_DICTIONARY:
|
||||
continue
|
||||
var dto := deck as Dictionary
|
||||
if str(dto.get("id", "")) != deck_id:
|
||||
next_decks.append(dto)
|
||||
|
||||
_decks_payload = { "decks": next_decks }
|
||||
_write_json_file(_decks_file_path(), _decks_payload)
|
||||
|
||||
|
||||
func _ensure_loaded() -> void:
|
||||
var current_player_id := Auth.user_id
|
||||
if current_player_id == _loaded_player_id:
|
||||
return
|
||||
_loaded_player_id = current_player_id
|
||||
_cards_pages.clear()
|
||||
_decks_payload.clear()
|
||||
_deck_payloads.clear()
|
||||
|
||||
|
||||
func _player_dir() -> String:
|
||||
return "%s/%s" % [CACHE_ROOT, _sanitize_path_component(_loaded_player_id)]
|
||||
|
||||
|
||||
func _cards_file_path(query_key: String) -> String:
|
||||
return "%s/cards_%s.json" % [_player_dir(), query_key.md5_text()]
|
||||
|
||||
|
||||
func _decks_file_path() -> String:
|
||||
return "%s/decks.json" % _player_dir()
|
||||
|
||||
|
||||
func _deck_file_path(deck_id: String) -> String:
|
||||
return "%s/deck_%s.json" % [_player_dir(), _sanitize_path_component(deck_id)]
|
||||
|
||||
|
||||
func _sanitize_path_component(value: String) -> String:
|
||||
var safe := value.strip_edges()
|
||||
if safe.is_empty():
|
||||
return "anonymous"
|
||||
return safe.replace("/", "_").replace("\\", "_").replace(":", "_")
|
||||
|
||||
|
||||
func _read_json_file(path: String) -> Dictionary:
|
||||
if not FileAccess.file_exists(path):
|
||||
return {}
|
||||
var file := FileAccess.open(path, FileAccess.READ)
|
||||
if not file:
|
||||
return {}
|
||||
var text := file.get_as_text()
|
||||
file.close()
|
||||
var parsed: Variant = JSON.parse_string(text)
|
||||
if typeof(parsed) == TYPE_DICTIONARY:
|
||||
return parsed as Dictionary
|
||||
return {}
|
||||
|
||||
|
||||
func _write_json_file(path: String, payload: Dictionary) -> void:
|
||||
DirAccess.make_dir_recursive_absolute(_player_dir())
|
||||
var file := FileAccess.open(path, FileAccess.WRITE)
|
||||
if not file:
|
||||
push_warning("CollectionCache: could not write %s" % path)
|
||||
return
|
||||
file.store_string(JSON.stringify(payload))
|
||||
file.close()
|
||||
@@ -0,0 +1 @@
|
||||
uid://cckxyye8h7ahj
|
||||
@@ -20,6 +20,7 @@ config/icon="res://icon.svg"
|
||||
Network="*res://autoloads/Network.gd"
|
||||
ContentCache="*res://autoloads/ContentCache.gd"
|
||||
Auth="*res://autoloads/Auth.gd"
|
||||
CollectionCache="*res://autoloads/CollectionCache.gd"
|
||||
|
||||
[display]
|
||||
|
||||
|
||||
@@ -110,7 +110,7 @@ func _populate_abilities(def: Dictionary) -> void:
|
||||
for child in abilities_list.get_children():
|
||||
child.queue_free()
|
||||
|
||||
var json_str := str(def.get("abilitiesJson", ""))
|
||||
var json_str := str(def.get("abilities", ""))
|
||||
if json_str.is_empty() or json_str == "[]":
|
||||
abilities_sep.visible = false
|
||||
abilities_title.visible = false
|
||||
|
||||
@@ -126,10 +126,12 @@ var _is_selected : bool = false
|
||||
|
||||
## Populate the widget.
|
||||
func setup(dto: Dictionary, def: Dictionary = {}) -> void:
|
||||
_affinity = str(dto.get("affinity", ""))
|
||||
_definition_id = str(dto.get("cardDefinitionId", ""))
|
||||
var rarity := str(dto.get("rarity", ""))
|
||||
var is_foil := bool(dto.get("isFoil", false))
|
||||
_definition_id = str(dto.get("cardDefinitionId", def.get("id", "")))
|
||||
_affinity = str(def.get("affinity", dto.get("affinity", "")))
|
||||
var rarity := str(def.get("rarity", dto.get("rarity", "")))
|
||||
var name := str(def.get("name", dto.get("name", "")))
|
||||
var card_type := str(def.get("cardType", dto.get("cardType", "")))
|
||||
var is_foil := bool(dto.get("isFoil", false))
|
||||
|
||||
_apply_style()
|
||||
|
||||
@@ -139,6 +141,8 @@ func setup(dto: Dictionary, def: Dictionary = {}) -> void:
|
||||
foil_label.visible = is_foil
|
||||
name_label.text = str(dto.get("name", "—"))
|
||||
type_label.text = str(dto.get("cardType", ""))
|
||||
name_label.text = name if not name.is_empty() else name_label.text
|
||||
type_label.text = card_type if not card_type.is_empty() else type_label.text
|
||||
rarity_label.text = rarity
|
||||
rarity_label.modulate = RARITY_COLOR.get(rarity, Color(0.67, 0.67, 0.67))
|
||||
|
||||
|
||||
@@ -246,6 +246,9 @@ func _load_deck_contents() -> void:
|
||||
for child in _deck_card_list.get_children():
|
||||
child.queue_free()
|
||||
_deck_loading_lbl.visible = true
|
||||
var cached := CollectionCache.get_deck_response(_deck_id)
|
||||
if not cached.is_empty():
|
||||
_render_deck_response(cached)
|
||||
Network.request(
|
||||
"collection.get_deck",
|
||||
{ "deckId": _deck_id },
|
||||
@@ -255,31 +258,9 @@ func _load_deck_contents() -> void:
|
||||
|
||||
|
||||
func _on_deck_response(payload: Variant) -> void:
|
||||
_deck_loading_lbl.visible = false
|
||||
var p := payload as Dictionary
|
||||
var deck_raw : Variant = p.get("deck", null)
|
||||
if deck_raw == null or typeof(deck_raw) != TYPE_DICTIONARY:
|
||||
push_warning("DeckEditor: missing deck in response")
|
||||
return
|
||||
var deck := deck_raw as Dictionary
|
||||
|
||||
var cards : Array = deck.get("cards", [])
|
||||
_deck_qty.clear()
|
||||
var non_as_total := 0
|
||||
for c in cards:
|
||||
var def_id := str(c.get("cardDefinitionId", ""))
|
||||
var qty := int(c.get("quantity", 0))
|
||||
if not def_id.is_empty():
|
||||
_deck_qty[def_id] = qty
|
||||
if str(c.get("cardType", "")) != "ArchSpirit":
|
||||
non_as_total += qty
|
||||
|
||||
_count_lbl.text = "%d / 40" % non_as_total
|
||||
|
||||
for c in cards:
|
||||
_deck_card_list.add_child(_make_deck_row(c))
|
||||
|
||||
_refresh_coll_in_deck_labels()
|
||||
var p := payload as Dictionary
|
||||
CollectionCache.store_deck_response(_deck_id, p)
|
||||
_render_deck_response(p)
|
||||
|
||||
|
||||
func _on_deck_error(msg: String) -> void:
|
||||
@@ -350,6 +331,9 @@ func _reload_collection() -> void:
|
||||
for child in _coll_list.get_children():
|
||||
child.queue_free()
|
||||
_load_more_btn.visible = false
|
||||
var cached := CollectionCache.get_cards_response(_collection_query_key(1))
|
||||
if not cached.is_empty():
|
||||
_render_coll_response(cached, 1)
|
||||
_fetch_coll_page(1)
|
||||
|
||||
|
||||
@@ -376,15 +360,10 @@ func _fetch_coll_page(page: int) -> void:
|
||||
|
||||
|
||||
func _on_coll_response(payload: Variant, page: int) -> void:
|
||||
_is_loading = false
|
||||
_coll_loading_lbl.visible = false
|
||||
var p := payload as Dictionary
|
||||
var cards : Array = p.get("cards", [])
|
||||
_coll_total = int(p.get("totalCount", 0))
|
||||
var ps := int(p.get("pageSize", PAGE_SIZE))
|
||||
_coll_page = page
|
||||
_has_more = (page * ps) < _coll_total
|
||||
_load_more_btn.visible = _has_more
|
||||
var p_cache := payload as Dictionary
|
||||
CollectionCache.store_cards_response(_collection_query_key(page), p_cache)
|
||||
_render_coll_response(p_cache, page)
|
||||
var cards : Array = []
|
||||
|
||||
# Track def_ids already in the list to avoid duplicates across pages
|
||||
var seen : Dictionary = {}
|
||||
@@ -497,3 +476,94 @@ func _remove_card(def_id: String, qty: Variant) -> void:
|
||||
func(_t: String, _p: Variant): _load_deck_contents(),
|
||||
func(_code: String, msg: String): push_warning("DeckEditor remove_card: %s" % msg)
|
||||
)
|
||||
|
||||
|
||||
func _render_deck_response(payload: Dictionary) -> void:
|
||||
_deck_loading_lbl.visible = false
|
||||
var deck_raw : Variant = payload.get("deck", null)
|
||||
if deck_raw == null or typeof(deck_raw) != TYPE_DICTIONARY:
|
||||
push_warning("DeckEditor: missing deck in response")
|
||||
return
|
||||
var deck := deck_raw as Dictionary
|
||||
|
||||
for child in _deck_card_list.get_children():
|
||||
child.queue_free()
|
||||
|
||||
var cards : Array = deck.get("cards", [])
|
||||
_deck_qty.clear()
|
||||
var non_as_total := 0
|
||||
for raw_card in cards:
|
||||
var card := raw_card as Dictionary
|
||||
var def_id := str(card.get("cardDefinitionId", ""))
|
||||
var qty := int(card.get("quantity", 0))
|
||||
if not def_id.is_empty():
|
||||
_deck_qty[def_id] = qty
|
||||
var def := ContentCache.get_definition(def_id)
|
||||
if str(def.get("cardType", "")) != "ArchSpirit":
|
||||
non_as_total += qty
|
||||
|
||||
_count_lbl.text = "%d / 40" % non_as_total
|
||||
|
||||
for raw_card in cards:
|
||||
var card := raw_card as Dictionary
|
||||
var def := ContentCache.get_definition(str(card.get("cardDefinitionId", "")))
|
||||
_deck_card_list.add_child(_make_deck_row(_hydrate_card_dto(card, def)))
|
||||
|
||||
_refresh_coll_in_deck_labels()
|
||||
|
||||
|
||||
func _render_coll_response(payload: Dictionary, page: int) -> void:
|
||||
_is_loading = false
|
||||
_coll_loading_lbl.visible = false
|
||||
var cards : Array = payload.get("cards", [])
|
||||
_coll_total = int(payload.get("totalCount", 0))
|
||||
var page_size := int(payload.get("pageSize", PAGE_SIZE))
|
||||
_coll_page = page
|
||||
_has_more = (page * page_size) < _coll_total
|
||||
_load_more_btn.visible = _has_more
|
||||
|
||||
if page == 1:
|
||||
for child in _coll_list.get_children():
|
||||
child.queue_free()
|
||||
|
||||
var seen : Dictionary = {}
|
||||
for child in _coll_list.get_children():
|
||||
if child.has_meta("def_id"):
|
||||
seen[str(child.get_meta("def_id"))] = true
|
||||
|
||||
for raw_dto in cards:
|
||||
var dto := raw_dto as Dictionary
|
||||
var def_id := str(dto.get("cardDefinitionId", ""))
|
||||
if def_id.is_empty() or def_id in seen:
|
||||
continue
|
||||
var def := ContentCache.get_definition(def_id)
|
||||
var tier_value: Variant = def.get("tier", null)
|
||||
var tier_num := 1
|
||||
if tier_value != null:
|
||||
tier_num = type_convert(tier_value, TYPE_INT)
|
||||
if str(def.get("cardType", "")) == "ArchSpirit" and tier_num <= 1:
|
||||
continue
|
||||
seen[def_id] = true
|
||||
_coll_list.add_child(_make_coll_row(_hydrate_card_dto(dto, def)))
|
||||
|
||||
|
||||
func _hydrate_card_dto(dto: Dictionary, def: Dictionary) -> Dictionary:
|
||||
var hydrated := dto.duplicate(true)
|
||||
if def.is_empty():
|
||||
return hydrated
|
||||
hydrated["name"] = str(def.get("name", hydrated.get("name", "")))
|
||||
hydrated["cardType"] = str(def.get("cardType", hydrated.get("cardType", "")))
|
||||
hydrated["affinity"] = str(def.get("affinity", hydrated.get("affinity", "")))
|
||||
hydrated["rarity"] = str(def.get("rarity", hydrated.get("rarity", "")))
|
||||
var tier_value: Variant = def.get("tier", hydrated.get("tier", null))
|
||||
hydrated["tier"] = tier_value if tier_value != null else null
|
||||
return hydrated
|
||||
|
||||
|
||||
func _collection_query_key(page: int) -> String:
|
||||
var search := _search_input.text.strip_edges()
|
||||
var type_filter := ""
|
||||
var type_idx := _type_option.selected
|
||||
if type_idx > 0:
|
||||
type_filter = _type_option.get_item_text(type_idx)
|
||||
return CollectionCache.cards_query_key(page, PAGE_SIZE, search, type_filter)
|
||||
|
||||
@@ -62,10 +62,14 @@ func _apply_setup(deck: Dictionary) -> void:
|
||||
name_label.text = _deck_name
|
||||
name_edit.text = _deck_name
|
||||
|
||||
var arch_name : String = str(deck.get("archSpiritName", ""))
|
||||
arch_spirit_label.text = arch_name if not arch_name.is_empty() else "No ArchSpirit"
|
||||
arch_spirit_label.modulate = Color(0.6, 0.6, 0.7) if arch_name.is_empty() \
|
||||
else Color(0.8, 0.8, 0.9)
|
||||
var arch_def_id := str(deck.get("archSpiritCardDefinitionId", ""))
|
||||
var arch_def := ContentCache.get_definition(arch_def_id)
|
||||
var arch_name := str(arch_def.get("name", ""))
|
||||
var has_arch := not arch_def_id.is_empty()
|
||||
arch_spirit_label.text = arch_name if not arch_name.is_empty() \
|
||||
else ("Unknown ArchSpirit" if has_arch else "No ArchSpirit")
|
||||
arch_spirit_label.modulate = Color(0.8, 0.8, 0.9) if has_arch \
|
||||
else Color(0.6, 0.6, 0.7)
|
||||
|
||||
count_label.text = "%d cards" % int(deck.get("cardCount", 0))
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ func _process(delta: float) -> void:
|
||||
func _populate_type_options() -> void:
|
||||
type_option.clear()
|
||||
type_option.add_item("All Types")
|
||||
for t in ["Creature", "Spell", "Item", "ArchSpirit"]:
|
||||
for t in ["Spirit", "Repentance", "Terramorpha", "ArchSpirit", "Ruin", "Instinct"]:
|
||||
type_option.add_item(t)
|
||||
|
||||
|
||||
@@ -96,6 +96,9 @@ func _reload() -> void:
|
||||
_has_more = false
|
||||
for child in card_grid.get_children():
|
||||
child.queue_free()
|
||||
var cached := CollectionCache.get_cards_response(_query_key_for_page(1))
|
||||
if not cached.is_empty():
|
||||
_render_cards_response(cached, 1)
|
||||
_fetch_page(1)
|
||||
|
||||
|
||||
@@ -133,27 +136,9 @@ func _fetch_page(page: int) -> void:
|
||||
|
||||
func _on_cards_response(payload: Variant, page: int) -> void:
|
||||
_loading = false
|
||||
var p := payload as Dictionary
|
||||
var cards : Array = p.get("cards", [])
|
||||
_total_count = int(p.get("totalCount", 0))
|
||||
var page_size : int = int(p.get("pageSize", PAGE_SIZE))
|
||||
_current_page = page
|
||||
_has_more = (page * page_size) < _total_count
|
||||
|
||||
for dto in cards:
|
||||
var def := ContentCache.get_definition(str(dto.get("cardDefinitionId", "")))
|
||||
var widget = CARD_WIDGET.instantiate() as PanelContainer
|
||||
widget.card_pressed.connect(func(_def_id: String):
|
||||
card_selected.emit(dto, def))
|
||||
card_grid.add_child(widget) # add_child triggers _ready / @onready before setup
|
||||
widget.setup(dto, def)
|
||||
|
||||
if cards.is_empty() and page == 1:
|
||||
_set_status("empty")
|
||||
else:
|
||||
_set_status("done")
|
||||
|
||||
load_more_btn.visible = _has_more
|
||||
var p := payload as Dictionary
|
||||
CollectionCache.store_cards_response(_query_key_for_page(page), p)
|
||||
_render_cards_response(p, page)
|
||||
|
||||
|
||||
func _on_error(msg: String) -> void:
|
||||
@@ -177,3 +162,63 @@ func _set_status(state: String) -> void:
|
||||
empty_label.visible = (state == "empty")
|
||||
if state != "loading":
|
||||
load_more_btn.visible = _has_more
|
||||
|
||||
|
||||
func _render_cards_response(payload: Dictionary, page: int) -> void:
|
||||
var cards : Array = payload.get("cards", [])
|
||||
_total_count = int(payload.get("totalCount", 0))
|
||||
var page_size : int = int(payload.get("pageSize", PAGE_SIZE))
|
||||
_current_page = page
|
||||
_has_more = (page * page_size) < _total_count
|
||||
|
||||
if page == 1:
|
||||
for child in card_grid.get_children():
|
||||
child.queue_free()
|
||||
|
||||
for raw_dto in cards:
|
||||
var dto := raw_dto as Dictionary
|
||||
var def := ContentCache.get_definition(str(dto.get("cardDefinitionId", "")))
|
||||
var hydrated := _hydrate_card_dto(dto, def)
|
||||
var widget = CARD_WIDGET.instantiate() as PanelContainer
|
||||
widget.card_pressed.connect(func(_def_id: String):
|
||||
card_selected.emit(hydrated, def))
|
||||
card_grid.add_child(widget)
|
||||
widget.setup(hydrated, def)
|
||||
|
||||
if cards.is_empty() and page == 1:
|
||||
_set_status("empty")
|
||||
else:
|
||||
_set_status("done")
|
||||
|
||||
load_more_btn.visible = _has_more
|
||||
|
||||
|
||||
func _hydrate_card_dto(dto: Dictionary, def: Dictionary) -> Dictionary:
|
||||
var hydrated := dto.duplicate(true)
|
||||
if def.is_empty():
|
||||
return hydrated
|
||||
hydrated["name"] = str(def.get("name", hydrated.get("name", "")))
|
||||
hydrated["cardType"] = str(def.get("cardType", hydrated.get("cardType", "")))
|
||||
hydrated["affinity"] = str(def.get("affinity", hydrated.get("affinity", "")))
|
||||
hydrated["rarity"] = str(def.get("rarity", hydrated.get("rarity", "")))
|
||||
var tier_value: Variant = def.get("tier", hydrated.get("tier", null))
|
||||
hydrated["tier"] = tier_value if tier_value != null else null
|
||||
return hydrated
|
||||
|
||||
|
||||
func _query_key_for_page(page: int) -> String:
|
||||
var search := search_input.text.strip_edges()
|
||||
var type_filter := ""
|
||||
var affinity_filter := ""
|
||||
var type_idx := type_option.selected
|
||||
if type_idx > 0:
|
||||
type_filter = type_option.get_item_text(type_idx)
|
||||
var aff_idx := affinity_option.selected
|
||||
if aff_idx > 0:
|
||||
affinity_filter = affinity_option.get_item_text(aff_idx)
|
||||
return CollectionCache.cards_query_key(
|
||||
page,
|
||||
PAGE_SIZE,
|
||||
search,
|
||||
type_filter,
|
||||
affinity_filter)
|
||||
|
||||
@@ -55,6 +55,9 @@ func _load_decks() -> void:
|
||||
for child in deck_list.get_children():
|
||||
child.queue_free()
|
||||
_set_status("loading")
|
||||
var cached := CollectionCache.get_decks_response()
|
||||
if not cached.is_empty():
|
||||
_render_decks(cached)
|
||||
|
||||
Network.request(
|
||||
"collection.get_decks",
|
||||
@@ -65,17 +68,9 @@ func _load_decks() -> void:
|
||||
|
||||
|
||||
func _on_decks_response(payload: Variant) -> void:
|
||||
var decks : Array = (payload as Dictionary).get("decks", [])
|
||||
_set_status(decks.is_empty(), "empty")
|
||||
|
||||
for deck in decks:
|
||||
var item = DECK_LIST_ITEM.instantiate()
|
||||
item.setup(deck)
|
||||
item.edit_requested.connect(_on_edit_requested)
|
||||
item.rename_requested.connect(_on_rename_requested)
|
||||
item.delete_requested.connect(_on_delete_requested)
|
||||
item.clone_requested.connect(_on_clone_requested)
|
||||
deck_list.add_child(item)
|
||||
var p := payload as Dictionary
|
||||
CollectionCache.store_decks_response(p)
|
||||
_render_decks(p)
|
||||
|
||||
|
||||
func _on_load_error(msg: String) -> void:
|
||||
@@ -108,6 +103,10 @@ func _clear_arch_spirit_grid() -> void:
|
||||
|
||||
func _load_arch_spirits() -> void:
|
||||
_clear_arch_spirit_grid()
|
||||
var query_key := CollectionCache.cards_query_key(1, 50, "", "ArchSpirit", "", 1)
|
||||
var cached := CollectionCache.get_cards_response(query_key)
|
||||
if not cached.is_empty():
|
||||
_render_arch_spirits(cached)
|
||||
Network.request(
|
||||
"collection.get_cards",
|
||||
{ "page": 1, "pageSize": 50, "cardTypeFilter": "ArchSpirit", "tierFilter": 1 },
|
||||
@@ -117,15 +116,31 @@ func _load_arch_spirits() -> void:
|
||||
|
||||
|
||||
func _on_arch_spirits(payload: Variant) -> void:
|
||||
var cards : Array = (payload as Dictionary).get("cards", [])
|
||||
var p := payload as Dictionary
|
||||
CollectionCache.store_cards_response(
|
||||
CollectionCache.cards_query_key(1, 50, "", "ArchSpirit", "", 1),
|
||||
p)
|
||||
_render_arch_spirits(p)
|
||||
|
||||
|
||||
func _render_arch_spirits(payload: Dictionary) -> void:
|
||||
var selected_before := _selected_arch_spirit_id
|
||||
_clear_arch_spirit_grid()
|
||||
var cards : Array = payload.get("cards", [])
|
||||
for dto in cards:
|
||||
var def := ContentCache.get_definition(str(dto.get("cardDefinitionId", "")))
|
||||
var card_dto := dto as Dictionary
|
||||
var def := ContentCache.get_definition(str(card_dto.get("cardDefinitionId", "")))
|
||||
var hydrated := _hydrate_card_dto(card_dto, def)
|
||||
var widget = CARD_WIDGET.instantiate()
|
||||
widget.custom_minimum_size = Vector2(110, 154)
|
||||
var def_id := str(dto.get("cardDefinitionId", ""))
|
||||
var def_id := str(card_dto.get("cardDefinitionId", ""))
|
||||
widget.card_pressed.connect(func(_d: String): _on_arch_spirit_selected(widget, def_id))
|
||||
arch_spirit_grid.add_child(widget) # add_child triggers _ready / @onready before setup
|
||||
widget.setup(dto, def)
|
||||
arch_spirit_grid.add_child(widget)
|
||||
widget.setup(hydrated, def)
|
||||
if def_id == selected_before:
|
||||
widget.set_selected(true)
|
||||
_selected_arch_spirit_id = def_id
|
||||
arch_spirit_hint.visible = false
|
||||
|
||||
|
||||
func _on_arch_spirit_selected(tapped_widget, def_id: String) -> void:
|
||||
@@ -187,6 +202,7 @@ func _on_delete_requested(deck_id: String, deck_name: String) -> void:
|
||||
func _on_delete_confirmed() -> void:
|
||||
if _pending_delete_id.is_empty():
|
||||
return
|
||||
CollectionCache.remove_deck(_pending_delete_id)
|
||||
Network.request(
|
||||
"collection.delete_deck",
|
||||
{ "deckId": _pending_delete_id },
|
||||
@@ -241,3 +257,33 @@ func _set_status(first_arg, second_arg = null) -> void:
|
||||
# Called as _set_status(is_empty, "empty")
|
||||
loading_label.visible = false
|
||||
empty_label.visible = bool(first_arg)
|
||||
|
||||
|
||||
func _render_decks(payload: Dictionary) -> void:
|
||||
for child in deck_list.get_children():
|
||||
child.queue_free()
|
||||
|
||||
var decks : Array = payload.get("decks", [])
|
||||
_set_status(decks.is_empty(), "empty")
|
||||
|
||||
for deck in decks:
|
||||
var item = DECK_LIST_ITEM.instantiate()
|
||||
item.setup(deck as Dictionary)
|
||||
item.edit_requested.connect(_on_edit_requested)
|
||||
item.rename_requested.connect(_on_rename_requested)
|
||||
item.delete_requested.connect(_on_delete_requested)
|
||||
item.clone_requested.connect(_on_clone_requested)
|
||||
deck_list.add_child(item)
|
||||
|
||||
|
||||
func _hydrate_card_dto(dto: Dictionary, def: Dictionary) -> Dictionary:
|
||||
var hydrated := dto.duplicate(true)
|
||||
if def.is_empty():
|
||||
return hydrated
|
||||
hydrated["name"] = str(def.get("name", hydrated.get("name", "")))
|
||||
hydrated["cardType"] = str(def.get("cardType", hydrated.get("cardType", "")))
|
||||
hydrated["affinity"] = str(def.get("affinity", hydrated.get("affinity", "")))
|
||||
hydrated["rarity"] = str(def.get("rarity", hydrated.get("rarity", "")))
|
||||
var tier_value: Variant = def.get("tier", hydrated.get("tier", null))
|
||||
hydrated["tier"] = tier_value if tier_value != null else null
|
||||
return hydrated
|
||||
|
||||
@@ -75,8 +75,12 @@ builder.Services.AddRazorPages();
|
||||
|
||||
// ── Redis ──────────────────────────────────────────────────────────────────
|
||||
builder.Services.AddSingleton<IConnectionMultiplexer>(_ =>
|
||||
ConnectionMultiplexer.Connect(
|
||||
builder.Configuration.GetConnectionString("Redis") ?? "localhost:6379"));
|
||||
{
|
||||
var redisConnectionString = builder.Configuration.GetConnectionString("Redis") ?? "localhost:6379";
|
||||
var redisOptions = ConfigurationOptions.Parse(redisConnectionString);
|
||||
redisOptions.AbortOnConnectFail = false;
|
||||
return ConnectionMultiplexer.Connect(redisOptions);
|
||||
});
|
||||
|
||||
// ── CDN client ────────────────────────────────────────────────────────────
|
||||
builder.Services.AddCdnClient(builder.Configuration);
|
||||
|
||||
@@ -77,16 +77,10 @@ public sealed record GetCardsResponse(
|
||||
public sealed record PlayerCardDto(
|
||||
Guid PlayerCardId,
|
||||
Guid CardDefinitionId,
|
||||
string Name,
|
||||
string CardType,
|
||||
string Affinity,
|
||||
string Rarity,
|
||||
bool IsFoil,
|
||||
int? SerialNumber,
|
||||
DateTimeOffset AcquiredAt,
|
||||
string? ArtUrl,
|
||||
bool IsTradeable = true,
|
||||
int? Tier = null);
|
||||
bool IsTradeable = true);
|
||||
|
||||
public sealed record GetDecksResponse(IEnumerable<DeckSummaryDto> Decks);
|
||||
|
||||
@@ -94,7 +88,6 @@ public sealed record DeckSummaryDto(
|
||||
Guid Id,
|
||||
string Name,
|
||||
Guid ArchSpiritCardDefinitionId,
|
||||
string? ArchSpiritName,
|
||||
int CardCount,
|
||||
bool IsValid,
|
||||
DateTimeOffset CreatedAt,
|
||||
@@ -108,7 +101,6 @@ public sealed record DeckDetailDto(
|
||||
Guid Id,
|
||||
string Name,
|
||||
Guid ArchSpiritCardDefinitionId,
|
||||
string? ArchSpiritName,
|
||||
bool IsValid,
|
||||
DateTimeOffset CreatedAt,
|
||||
DateTimeOffset UpdatedAt,
|
||||
@@ -117,11 +109,6 @@ public sealed record DeckDetailDto(
|
||||
|
||||
public sealed record DeckCardDto(
|
||||
Guid CardDefinitionId,
|
||||
string Name,
|
||||
string CardType,
|
||||
string Affinity,
|
||||
string Rarity,
|
||||
string? ArtUrl,
|
||||
int Quantity,
|
||||
int OwnedCount);
|
||||
|
||||
|
||||
@@ -117,16 +117,10 @@ internal sealed class CollectionAddCardHandler : CollectionHandlerBase, IMessage
|
||||
|
||||
var warnings = await RefreshValidityAsync(_collectionDb, _catalogDb, deck, cancellationToken);
|
||||
|
||||
var archName = await _catalogDb.CardDefinitions
|
||||
.Where(cd => cd.Id == deck.ArchSpiritCardDefinitionId)
|
||||
.Select(cd => cd.Name)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
var summary = new DeckSummaryDto(
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archName,
|
||||
CardCount: deck.Cards.Sum(c => c.Quantity),
|
||||
IsValid: deck.IsValid,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
|
||||
@@ -93,16 +93,10 @@ internal sealed class CollectionCloneDeckHandler : CollectionHandlerBase, IMessa
|
||||
// Revalidate the clone (ownership/validity may have changed since original was built).
|
||||
var warnings = await RefreshValidityAsync(_collectionDb, _catalogDb, clone, cancellationToken);
|
||||
|
||||
var archName = await _catalogDb.CardDefinitions
|
||||
.Where(cd => cd.Id == clone.ArchSpiritCardDefinitionId)
|
||||
.Select(cd => cd.Name)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
var summary = new DeckSummaryDto(
|
||||
Id: clone.Id,
|
||||
Name: clone.Name,
|
||||
ArchSpiritCardDefinitionId: clone.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archName,
|
||||
CardCount: original.Cards.Sum(c => c.Quantity),
|
||||
IsValid: clone.IsValid,
|
||||
CreatedAt: clone.CreatedAt,
|
||||
|
||||
@@ -92,7 +92,6 @@ internal sealed class CollectionCreateDeckHandler : CollectionHandlerBase, IMess
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archDef.Name,
|
||||
CardCount: 0,
|
||||
IsValid: false,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
|
||||
@@ -80,29 +80,14 @@ internal sealed class CollectionGetCardsHandler : CollectionHandlerBase, IMessag
|
||||
.Take(pageSize)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
// Batch-fetch definitions from catalog schema.
|
||||
var definitions = await LoadDefinitionsAsync(
|
||||
_catalogDb,
|
||||
playerCards.Select(pc => pc.CardDefinitionId),
|
||||
cancellationToken);
|
||||
|
||||
var dtos = playerCards.Select(pc =>
|
||||
{
|
||||
definitions.TryGetValue(pc.CardDefinitionId, out var def);
|
||||
return new PlayerCardDto(
|
||||
new PlayerCardDto(
|
||||
PlayerCardId: pc.Id,
|
||||
CardDefinitionId: pc.CardDefinitionId,
|
||||
Name: def?.Name ?? "Unknown",
|
||||
CardType: def?.CardType.ToString() ?? "Unknown",
|
||||
Affinity: def?.Affinity.ToString() ?? "Unknown",
|
||||
Rarity: def?.Rarity.ToString() ?? "Unknown",
|
||||
IsFoil: pc.IsFoil,
|
||||
SerialNumber: pc.SerialNumber,
|
||||
AcquiredAt: pc.AcquiredAt,
|
||||
ArtUrl: GetArtUrl(def),
|
||||
IsTradeable: pc.IsTradeable,
|
||||
Tier: def?.Tier ?? 1);
|
||||
});
|
||||
IsTradeable: pc.IsTradeable));
|
||||
|
||||
return ServerMessage.Reply(
|
||||
"collection.get_cards.ack",
|
||||
|
||||
@@ -15,16 +15,13 @@ internal sealed class CollectionGetDeckHandler : CollectionHandlerBase, IMessage
|
||||
{
|
||||
private readonly IMessageSerializer _serializer;
|
||||
private readonly CollectionDbContext _collectionDb;
|
||||
private readonly CatalogDbContext _catalogDb;
|
||||
|
||||
public CollectionGetDeckHandler(
|
||||
IMessageSerializer serializer,
|
||||
CollectionDbContext collectionDb,
|
||||
CatalogDbContext catalogDb)
|
||||
CollectionDbContext collectionDb)
|
||||
{
|
||||
_serializer = serializer;
|
||||
_collectionDb = collectionDb;
|
||||
_catalogDb = catalogDb;
|
||||
}
|
||||
|
||||
public string MessageType => "collection.get_deck";
|
||||
@@ -46,42 +43,24 @@ internal sealed class CollectionGetDeckHandler : CollectionHandlerBase, IMessage
|
||||
if (deck == null)
|
||||
return ServerMessage.Error(message.Seq, "DECK_NOT_FOUND", "Deck not found.");
|
||||
|
||||
// Batch-load definitions for all cards + the ArchSpirit.
|
||||
var allDefIds = deck.Cards
|
||||
.Select(c => c.CardDefinitionId)
|
||||
.Append(deck.ArchSpiritCardDefinitionId)
|
||||
.Distinct();
|
||||
|
||||
var definitions = await LoadDefinitionsAsync(_catalogDb, allDefIds, cancellationToken);
|
||||
var ownedCounts = await GetOwnedCountsAsync(
|
||||
_collectionDb,
|
||||
accountId,
|
||||
deck.Cards.Select(c => c.CardDefinitionId),
|
||||
cancellationToken);
|
||||
|
||||
definitions.TryGetValue(deck.ArchSpiritCardDefinitionId, out var archDef);
|
||||
|
||||
var cardDtos = deck.Cards
|
||||
.OrderBy(c => definitions.TryGetValue(c.CardDefinitionId, out var d) ? d.Name : "")
|
||||
.OrderBy(c => c.CardDefinitionId)
|
||||
.Select(c =>
|
||||
{
|
||||
definitions.TryGetValue(c.CardDefinitionId, out var def);
|
||||
return new DeckCardDto(
|
||||
new DeckCardDto(
|
||||
CardDefinitionId: c.CardDefinitionId,
|
||||
Name: def?.Name ?? "Unknown",
|
||||
CardType: def?.CardType.ToString() ?? "Unknown",
|
||||
Affinity: def?.Affinity.ToString() ?? "Unknown",
|
||||
Rarity: def?.Rarity.ToString() ?? "Unknown",
|
||||
ArtUrl: GetArtUrl(def),
|
||||
Quantity: c.Quantity,
|
||||
OwnedCount: ownedCounts.GetValueOrDefault(c.CardDefinitionId));
|
||||
});
|
||||
OwnedCount: ownedCounts.GetValueOrDefault(c.CardDefinitionId)));
|
||||
|
||||
var dto = new DeckDetailDto(
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archDef?.Name,
|
||||
IsValid: deck.IsValid,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
UpdatedAt: deck.UpdatedAt,
|
||||
|
||||
@@ -13,14 +13,10 @@ using SOR.Shared.Networking;
|
||||
internal sealed class CollectionGetDecksHandler : CollectionHandlerBase, IMessageHandler
|
||||
{
|
||||
private readonly CollectionDbContext _collectionDb;
|
||||
private readonly CatalogDbContext _catalogDb;
|
||||
|
||||
public CollectionGetDecksHandler(
|
||||
CollectionDbContext collectionDb,
|
||||
CatalogDbContext catalogDb)
|
||||
public CollectionGetDecksHandler(CollectionDbContext collectionDb)
|
||||
{
|
||||
_collectionDb = collectionDb;
|
||||
_catalogDb = catalogDb;
|
||||
}
|
||||
|
||||
public string MessageType => "collection.get_decks";
|
||||
@@ -47,17 +43,10 @@ internal sealed class CollectionGetDecksHandler : CollectionHandlerBase, IMessag
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
// Batch-fetch ArchSpirit names from catalog.
|
||||
var archIds = decks.Select(d => d.ArchSpiritCardDefinitionId).Distinct().ToList();
|
||||
var archNames = await _catalogDb.CardDefinitions
|
||||
.Where(cd => archIds.Contains(cd.Id))
|
||||
.ToDictionaryAsync(cd => cd.Id, cd => cd.Name, cancellationToken);
|
||||
|
||||
var summaries = decks.Select(d => new DeckSummaryDto(
|
||||
Id: d.Id,
|
||||
Name: d.Name,
|
||||
ArchSpiritCardDefinitionId: d.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archNames.GetValueOrDefault(d.ArchSpiritCardDefinitionId),
|
||||
CardCount: d.CardCount,
|
||||
IsValid: d.IsValid,
|
||||
CreatedAt: d.CreatedAt,
|
||||
|
||||
@@ -66,16 +66,10 @@ internal sealed class CollectionRemoveCardHandler : CollectionHandlerBase, IMess
|
||||
|
||||
var warnings = await RefreshValidityAsync(_collectionDb, _catalogDb, deck, cancellationToken);
|
||||
|
||||
var archName = await _catalogDb.CardDefinitions
|
||||
.Where(cd => cd.Id == deck.ArchSpiritCardDefinitionId)
|
||||
.Select(cd => cd.Name)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
var summary = new DeckSummaryDto(
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archName,
|
||||
CardCount: deck.Cards.Sum(c => c.Quantity),
|
||||
IsValid: deck.IsValid,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
|
||||
@@ -13,16 +13,13 @@ internal sealed class CollectionRenameDeckHandler : CollectionHandlerBase, IMess
|
||||
{
|
||||
private readonly IMessageSerializer _serializer;
|
||||
private readonly CollectionDbContext _collectionDb;
|
||||
private readonly CatalogDbContext _catalogDb;
|
||||
|
||||
public CollectionRenameDeckHandler(
|
||||
IMessageSerializer serializer,
|
||||
CollectionDbContext collectionDb,
|
||||
CatalogDbContext catalogDb)
|
||||
CollectionDbContext collectionDb)
|
||||
{
|
||||
_serializer = serializer;
|
||||
_collectionDb = collectionDb;
|
||||
_catalogDb = catalogDb;
|
||||
}
|
||||
|
||||
public string MessageType => "collection.rename_deck";
|
||||
@@ -51,16 +48,10 @@ internal sealed class CollectionRenameDeckHandler : CollectionHandlerBase, IMess
|
||||
deck.UpdatedAt = DateTimeOffset.UtcNow;
|
||||
await _collectionDb.SaveChangesAsync(cancellationToken);
|
||||
|
||||
var archName = await _catalogDb.CardDefinitions
|
||||
.Where(cd => cd.Id == deck.ArchSpiritCardDefinitionId)
|
||||
.Select(cd => cd.Name)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
var summary = new DeckSummaryDto(
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archName,
|
||||
CardCount: deck.Cards.Sum(c => c.Quantity),
|
||||
IsValid: deck.IsValid,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
|
||||
@@ -138,16 +138,10 @@ internal sealed class CollectionSelectStarterDeckHandler : CollectionHandlerBase
|
||||
await _identityDb.SaveChangesAsync(cancellationToken);
|
||||
|
||||
// ── Build response ────────────────────────────────────────────────────
|
||||
var archName = await _catalogDb.CardDefinitions
|
||||
.Where(cd => cd.Id == deck.ArchSpiritCardDefinitionId)
|
||||
.Select(cd => cd.Name)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
var summary = new DeckSummaryDto(
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archName,
|
||||
CardCount: starterDeck.Cards.Sum(c => c.Quantity),
|
||||
IsValid: deck.IsValid,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
|
||||
@@ -40,6 +40,11 @@ spec:
|
||||
secretKeyRef:
|
||||
name: sor-app-secrets
|
||||
key: ConnectionStrings__Default
|
||||
- name: ConnectionStrings__Redis
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: redis-credentials
|
||||
key: connection-string
|
||||
|
||||
# CDN (Ceph RadosGW S3-compatible) — needed for asset uploads in the admin portal.
|
||||
- name: Cdn__PublicBaseUrl
|
||||
|
||||
Reference in New Issue
Block a user