refac, fix: General 객체 생성 과정에서 accessLog 분리

- 생성자 인수 1개 추가,
- mergeQueryColumn에서 $accessLogColumn에 정상적으로 enum[] 반영
- createGeneralObjListFromDB를 쿼리 1회 분리
- General에 getAccessLogVar() 추가
  - 변경 기능 제공 예정 '없음'
- 변경된 생성자에 맞게 호출 부 변경
- NPC인 경우 accessLog 조회값이 null일 수 있으므로 반영

hwe/sammo/API/General/GetFrontInfo.php

@@ -385,7 +385,7 @@ class GetFrontInfo extends \sammo\BaseAPI
       'personal' => $general->getVar(GeneralColumn::personal), // GameObjClassKey;
       'belong' => $general->getVar(GeneralColumn::belong), // number;
 
-      'refreshScoreTotal' => $general->getVar(GeneralAccessLogColumn::refreshScoreTotal), // number;
+      'refreshScoreTotal' => $general->getAccessLogVar(GeneralAccessLogColumn::refreshScoreTotal, 0), // number;
 
       'officerLevel' => $general->getVar(GeneralColumn::officer_level), // number;
       'officerLevelText' => getOfficerLevelText($general->getVar(GeneralColumn::officer_level), $rawNation['level']), // string;
@@ -402,7 +402,7 @@ class GetFrontInfo extends \sammo\BaseAPI
       'troop' => $general->getVar(GeneralColumn::troop), // number;
       //P0 End
 
-      'refreshScore' => $general->getVar(GeneralAccessLogColumn::refreshScore), // number;
+      'refreshScore' => $general->getAccessLogVar(GeneralAccessLogColumn::refreshScore, 0), // number;
       'specage' => $general->getVar(GeneralColumn::specage), // number;
       'specage2' => $general->getVar(GeneralColumn::specage2), // number;
       'leadership_exp' => $general->getVar(GeneralColumn::leadership_exp), // number;
@@ -537,7 +537,7 @@ class GetFrontInfo extends \sammo\BaseAPI
     $nationID = $general->getNationID();
     $cityID = $general->getCityID();
 
-    $limitState = checkLimit($general->getVar('refresh_score') ?? 0);
+    $limitState = checkLimit($general->getAccessLogVar(GeneralAccessLogColumn::refreshScore, 0));
     if ($limitState >= 2) {
       return [
         'result' => false,

hwe/sammo/API/Global/GeneralList.php

@@ -108,7 +108,7 @@ class GeneralList extends \sammo\BaseAPI
                 getDed($dedication),
                 getOfficerLevelText($officerLevel, $nationArr['level']),
                 $killturn,
-                $refreshScoreTotal
+                $refreshScoreTotal ?: 0,
             ];
         }
 

hwe/sammo/API/Nation/GeneralList.php

@@ -82,7 +82,7 @@ class GeneralList extends \sammo\BaseAPI
         'owner_name' => 9, //안씀.
 
 
-        //acessLog
+        //accessLog
         'refresh_score_total' => 0,
         'refresh_score' => 1,
 
@@ -98,6 +98,8 @@ class GeneralList extends \sammo\BaseAPI
     static $columnRemap = [
         'special' => 'specialDomestic',
         'special2' => 'specialWar',
+        'refresh_score_total' => 'refreshScoreTotal',
+        'refresh_score' => 'refreshScore',
         'aux' => null,
     ];
 

hwe/sammo/API/NationCommand/GetReservedCommand.php

@@ -62,7 +62,7 @@ class GetReservedCommand extends \sammo\BaseAPI
 
         $generals = [];
         foreach ($db->query('SELECT no,name,turntime,npc,city,nation,officer_level FROM general WHERE nation = %i AND officer_level >= 5', $nationID) as $rawGeneral) {
-            $generals[$rawGeneral['officer_level']] = new General($rawGeneral, null, null, null, $year, $month, false);
+            $generals[$rawGeneral['officer_level']] = new General($rawGeneral, null, null, null, null, $year, $month, false);
         }
 
         $nationTurnList = [];