[change] N1-> 2N

python/views/get_isu_list.py

@@ -30,59 +30,39 @@ def _get_isu_list(cnxpool):
     jia_user_id = get_user_id_from_session(cnxpool)
 
     query = """
-        with latest_condition as (
-            SELECT *
-            FROM isu_condition
-            where (`jia_isu_uuid`, timestamp) in
-                  (select `jia_isu_uuid`, max(timestamp) from `isu_condition` group by `jia_isu_uuid`)
-        )
-        SELECT `isu`.id,
-                `isu`.jia_user_id,
-               `isu`.jia_isu_uuid,
-               `isu`.name,
-               `isu`.`character`,
-               `isu`.`created_at`,
-               `isu`.`updated_at`,
-               `isu`.`image`,
-               ic.id as ic_id,
-               ic.timestamp,
-               ic.is_sitting,
-               ic.`condition`,
-               ic.warn_count,
-               ic.message
-        FROM `isu`
-                 left outer join latest_condition ic on isu.jia_isu_uuid = ic.jia_isu_uuid
-        WHERE `jia_user_id` = %s
-        ORDER BY `isu`.`id` DESC
+        SELECT * FROM `isu` WHERE `jia_user_id` = %s ORDER BY `id` DESC
     """
+    isu_list = [Isu(**row) for row in select_all(cnxpool, query, (jia_user_id,))]
+
+    isu_uuid_list = [isu.jia_isu_uuid for isu in isu_list]
+    isucon_query = """
+    SELECT
+        *
+    FROM
+        isu_condition
+    where
+        (`jia_isu_uuid`, timestamp) in(
+            select
+                `jia_isu_uuid`,
+                max(timestamp)
+            from
+                `isu_condition`
+            where
+                 `jia_isu_uuid` in ({id_list})
+            group by
+                `jia_isu_uuid`
+        )
+    """.format(id_list=','.join(isu_uuid_list))
+    isucon_map = {
+        row['jia_isu_uuid']: IsuCondition(**row) for row in select_all(cnxpool, isucon_query)
+    }
 
     response_list = []
-    for row in select_all(cnxpool, query, (jia_user_id,)):
-        isu = Isu(**{
-            'id': row['id'],
-            'jia_isu_uuid': row['jia_isu_uuid'],
-            'name': row['name'],
-            'image': row['image'],
-            'character': row['character'],
-            'jia_user_id': row['jia_user_id'],
-            'created_at': row['created_at'],
-            'updated_at': row['updated_at']
-        })
-        # 状態情報があるか
-        found_last_condition = row['ic_id'] is not None
-        last_condition = IsuCondition(**{
-            'id': row['ic_id'],
-            'jia_isu_uuid': row['jia_isu_uuid'],
-            'timestamp': row['timestamp'],
-            'is_sitting': row['is_sitting'],
-            'condition': row['condition'],
-            'message': row['message'],
-            'warn_count': row['warn_count'],
-            'created_at': row['created_at'],
-        }) if found_last_condition else None
+    for isu in isu_list:
+        last_condition = isucon_map.get(isu.jia_isu_uuid)
 
         formatted_condition = None
-        if found_last_condition:
+        if last_condition:
             formatted_condition = GetIsuConditionResponse(
                 jia_isu_uuid=last_condition.jia_isu_uuid,
                 isu_name=isu.name,