From ac7c3c25b3fb1744018482bace5859546d8d9530 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Thu, 27 Jul 2023 17:14:48 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=A4=80=EB=B9=84=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/GeneralLite.php | 45 ++-------------------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/hwe/sammo/GeneralLite.php b/hwe/sammo/GeneralLite.php
index 5c761890..0412d01a 100644
--- a/hwe/sammo/GeneralLite.php
+++ b/hwe/sammo/GeneralLite.php
@@ -298,10 +298,8 @@ class GeneralLite
 
         /**
          * @var string[] $column
-         * @var RankColumn[] $rankColumn
-         * @var GeneralAccessLogColumn[] $accessLogColumn
          */
-        [$column, $rankColumn, $accessLogColumn] = static::mergeQueryColumn($column, $queryMode);
+        [$column,,] = static::mergeQueryColumn($column, $queryMode);
 
         if ($generalIDList === null) {
             $rawGenerals = Util::convertArrayToDict(
@@ -317,52 +315,13 @@ class GeneralLite
             );
         }
 
-
-        /** @var Map<int,Map<RankColumn,int|float>> */
-        $rawRanks = new Map();
-        if ($rankColumn) {
-            $rawValue = $db->queryAllLists(
-                'SELECT `general_id`, `type`, `value` FROM rank_data WHERE general_id IN %li AND `type` IN %ls',
-                $generalIDList,
-                array_map(fn (\BackedEnum $e) => $e->value, $rankColumn)
-            );
-            foreach ($rawValue as [$generalID, $rawRankType, $rankValue]) {
-                if (!$rawRanks->hasKey($generalID)) {
-                    $rawRanks[$generalID] = new Map();
-                }
-
-                $rankType = RankColumn::from($rawRankType);
-                $rawRanks[$generalID][$rankType] = $rankValue;
-            }
-        }
-
-        $rawAccessLogs = new Map();
-        if ($accessLogColumn) {
-            $rawValue = $db->query(
-                'SELECT `general_id`, %l FROM general_access_log WHERE general_id IN %li',
-                Util::formatListOfBackticks($accessLogColumn),
-                $generalIDList
-            );
-            foreach ($rawValue as $rawLog) {
-                $generalID = $rawLog['general_id'];
-                $logValue = new Map();
-                foreach ($rawLog as $key => $value) {
-                    $logValue[GeneralAccessLogColumn::from($key)] = $value;
-                }
-                $rawAccessLogs[$generalID] = $logValue;
-            }
-        }
-
         $result = [];
         foreach ($generalIDList as $generalID) {
             if (!key_exists($generalID, $rawGenerals)) {
                 $result[$generalID] = new DummyGeneral($queryMode->value > 0);
                 continue;
             }
-            if ($rawRanks->hasKey($generalID) && $rawRanks[$generalID]->count() !== count($rankColumn)) {
-                throw new \RuntimeException('column의 수가 일치하지 않음 : ' . $generalID);
-            }
-            $result[$generalID] = new static($rawGenerals[$generalID], $rawRanks[$generalID] ?? null, $rawAccessLogs[$generalID] ?? null, null, null, $year, $month, $queryMode->value >= GeneralQueryMode::Full->value);
+            $result[$generalID] = new static($rawGenerals[$generalID], null, null, $year, $month);
         }
 
         return $result;