From 516c6e725e5e94fe7bc7ba2c3abb4393301ecd7d Mon Sep 17 00:00:00 2001 From: Jacob Schmidt Date: Sat, 16 May 2026 23:30:54 -0500 Subject: [PATCH] feat: Refactor CAD store payload handling by removing unused buildSeedHydratePayload function --- .../addons/cad/functions/fnc_initCadStore.sqf | 45 +++++-------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/arma/server/addons/cad/functions/fnc_initCadStore.sqf b/arma/server/addons/cad/functions/fnc_initCadStore.sqf index 2040ad3..0bec8bb 100644 --- a/arma/server/addons/cad/functions/fnc_initCadStore.sqf +++ b/arma/server/addons/cad/functions/fnc_initCadStore.sqf @@ -294,38 +294,6 @@ GVAR(CadStoreBaseClass) = compileFinal createHashMapFromArray [ _self call ["emitGroupEvent", ["cad.group.updated", _result]]; _result }], - ["buildSeedHydratePayload", compileFinal { - params [["_seed", createHashMap, [createHashMap]]]; - - private _session = _seed getOrDefault ["session", createHashMap]; - private _isDispatcher = _session getOrDefault ["isDispatcher", false]; - private _contracts = []; - - if (_isDispatcher) then { - { - if !(_x isEqualType createHashMap) then { continue; }; - - private _entry = +_x; - private _taskID = _entry getOrDefault ["taskId", _entry getOrDefault ["taskID", ""]]; - if (_taskID isEqualTo "") then { continue; }; - - _entry set ["taskId", _taskID]; - _entry set ["taskID", _taskID]; - _entry set ["assignedGroupId", ""]; - _entry set ["assignmentState", "unassigned"]; - _contracts pushBack _entry; - } forEach (_seed getOrDefault ["activeTasks", []]); - }; - - createHashMapFromArray [ - ["groups", _seed getOrDefault ["groups", []]], - ["contracts", _contracts], - ["requests", []], - ["assignments", []], - ["activity", []], - ["session", _session] - ] - }], ["buildHydratePayload", compileFinal { params [["_uid", "", [""]]]; @@ -345,12 +313,19 @@ GVAR(CadStoreBaseClass) = compileFinal createHashMapFromArray [ ["activeTasks", EGVAR(task,TaskStore) call ["getActiveTaskCatalog", []]], ["session", _session] ]; - private _seedPayload = _self call ["buildSeedHydratePayload", [_seed]]; + private _emptyPayload = createHashMapFromArray [ + ["groups", _seed get "groups"], + ["contracts", []], + ["requests", []], + ["assignments", []], + ["activity", []], + ["session", _session] + ]; private _persistenceService = _self getOrDefault ["PersistenceService", createHashMap]; if (_persistenceService isEqualTo createHashMap) exitWith { ["WARNING", "CAD hydrate extension state is unavailable; returning seed-only payload."] call EFUNC(common,log); - _seedPayload + _emptyPayload }; private _hydrateResult = _persistenceService call ["buildHydratePayload", [_seed]]; @@ -359,7 +334,7 @@ GVAR(CadStoreBaseClass) = compileFinal createHashMapFromArray [ }; ["WARNING", "CAD hydrate failed in the extension; returning seed-only payload."] call EFUNC(common,log); - _seedPayload + _emptyPayload }] ];