관리자 화면 분리 및 요청/아이템 관리 흐름 정리

backend/src/db.js

@@ -85,6 +85,7 @@ function mapGameItemRow(row) {
     gameId: row.game_id,
     src: row.src,
     label: row.label,
+    displayOrder: row.display_order == null ? null : Number(row.display_order),
     createdAt: Number(row.created_at),
   }
 }
@@ -271,12 +272,18 @@ async function ensureSchema() {
         game_id VARCHAR(120) NOT NULL,
         src VARCHAR(255) NOT NULL,
         label VARCHAR(120) NOT NULL,
+        display_order INT NULL DEFAULT NULL,
         created_at BIGINT NOT NULL,
         INDEX idx_game_items_game_id (game_id),
         CONSTRAINT fk_game_items_game FOREIGN KEY (game_id) REFERENCES games(id) ON DELETE CASCADE
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
     `)
 
+    const gameItemDisplayOrderColumns = await query("SHOW COLUMNS FROM game_items LIKE 'display_order'")
+    if (!gameItemDisplayOrderColumns.length) {
+      await query('ALTER TABLE game_items ADD COLUMN display_order INT NULL DEFAULT NULL AFTER label')
+    }
+
     await query(`
       CREATE TABLE IF NOT EXISTS custom_items (
         id VARCHAR(64) PRIMARY KEY,
@@ -668,14 +675,23 @@ async function findGameById(id) {
 
 async function listGameItems(gameId) {
   const rows = await query(
-    'SELECT id, game_id, src, label, created_at FROM game_items WHERE game_id = ? ORDER BY created_at ASC',
+    `
+      SELECT id, game_id, src, label, display_order, created_at
+      FROM game_items
+      WHERE game_id = ?
+      ORDER BY
+        CASE WHEN display_order IS NULL THEN 1 ELSE 0 END ASC,
+        display_order ASC,
+        created_at DESC,
+        id DESC
+    `,
     [gameId]
   )
   return rows.map(mapGameItemRow)
 }
 
 async function findGameItemById(itemId) {
-  const rows = await query('SELECT id, game_id, src, label, created_at FROM game_items WHERE id = ? LIMIT 1', [itemId])
+  const rows = await query('SELECT id, game_id, src, label, display_order, created_at FROM game_items WHERE id = ? LIMIT 1', [itemId])
   return mapGameItemRow(rows[0])
 }
 
@@ -1077,23 +1093,42 @@ async function clearImageOptimizationJobs({ month } = {}) {
 }
 async function createGameItem({ id, gameId, src, label }) {
   const createdAt = now()
-  await query('INSERT INTO game_items (id, game_id, src, label, created_at) VALUES (?, ?, ?, ?, ?)', [
+  const minOrderRows = await query('SELECT MIN(display_order) AS min_display_order FROM game_items WHERE game_id = ?', [gameId])
+  const nextDisplayOrder =
+    minOrderRows[0]?.min_display_order == null ? 0 : Number(minOrderRows[0].min_display_order) - 1
+  await query('INSERT INTO game_items (id, game_id, src, label, display_order, created_at) VALUES (?, ?, ?, ?, ?, ?)', [
     id,
     gameId,
     src,
     label,
+    nextDisplayOrder,
     createdAt,
   ])
-  const rows = await query('SELECT id, game_id, src, label, created_at FROM game_items WHERE id = ? LIMIT 1', [id])
+  const rows = await query('SELECT id, game_id, src, label, display_order, created_at FROM game_items WHERE id = ? LIMIT 1', [id])
   return mapGameItemRow(rows[0])
 }
 
 async function updateGameItemLabel(itemId, label) {
   await query('UPDATE game_items SET label = ? WHERE id = ?', [label, itemId])
-  const rows = await query('SELECT id, game_id, src, label, created_at FROM game_items WHERE id = ? LIMIT 1', [itemId])
+  const rows = await query('SELECT id, game_id, src, label, display_order, created_at FROM game_items WHERE id = ? LIMIT 1', [itemId])
   return mapGameItemRow(rows[0])
 }
 
+async function updateGameItemDisplayOrder(gameId, itemIds) {
+  const normalizedIds = Array.from(new Set((itemIds || []).filter(Boolean)))
+  const existingItems = await listGameItems(gameId)
+  const existingIdSet = new Set(existingItems.map((item) => item.id))
+  const orderedIds = normalizedIds.filter((id) => existingIdSet.has(id))
+  const remainingIds = existingItems.map((item) => item.id).filter((id) => !orderedIds.includes(id))
+  const finalIds = [...orderedIds, ...remainingIds]
+
+  await Promise.all(
+    finalIds.map((itemId, index) => query('UPDATE game_items SET display_order = ? WHERE id = ? AND game_id = ?', [index + 1, itemId, gameId]))
+  )
+
+  return listGameItems(gameId)
+}
+
 async function updateCustomItemLabel(itemId, label) {
   await query('UPDATE custom_items SET label = ? WHERE id = ?', [label, itemId])
   const rows = await query(`
@@ -1916,7 +1951,11 @@ async function findTemplateRequestById(id) {
   return mapTemplateRequestRow(rows[0])
 }
 
-async function listAdminTemplateRequests({ status = 'pending' } = {}) {
+async function listAdminTemplateRequests({ status = 'pending', statuses = [] } = {}) {
+  const requestedStatuses = Array.isArray(statuses) && statuses.length ? statuses : [status]
+  const validStatuses = requestedStatuses.filter((entry) => typeof entry === 'string' && entry.trim())
+  const normalizedStatuses = validStatuses.length ? validStatuses : ['pending']
+  const placeholders = normalizedStatuses.map(() => '?').join(', ')
   const rows = await query(
     `
       SELECT
@@ -1945,10 +1984,16 @@ async function listAdminTemplateRequests({ status = 'pending' } = {}) {
       INNER JOIN users u ON u.id = tr.requester_id
       LEFT JOIN games sg ON sg.id = tr.source_game_id
       LEFT JOIN games tg ON tg.id = tr.target_game_id
-      WHERE tr.status = ?
-      ORDER BY tr.created_at DESC
+      WHERE tr.status IN (${placeholders})
+      ORDER BY
+        CASE tr.status
+          WHEN 'pending' THEN 0
+          WHEN 'reviewing' THEN 1
+          ELSE 2
+        END,
+        tr.created_at DESC
     `,
-    [status]
+    normalizedStatuses
   )
 
   return rows.map(mapTemplateRequestRow)
@@ -2111,6 +2156,7 @@ module.exports = {
   getImageAssetStats,
   createGameItem,
   updateGameItemLabel,
+  updateGameItemDisplayOrder,
   updateCustomItemLabel,
   updateImageAssetLabel,
   deleteGameItem,