릴리스: v1.3.34 관리자 아이템 라이브러리 정리

backend/src/db.js

@@ -649,6 +649,11 @@ async function listGameItems(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])
+  return mapGameItemRow(rows[0])
+}
+
 async function getGameDetail(gameId) {
   const game = await findGameById(gameId)
   if (!game) return null
@@ -1208,32 +1213,60 @@ async function getCustomItemUsageMeta() {
 async function listCustomItems({ queryText = '', page = 1, limit = 50, orphanOnly = false } = {}) {
   const normalizedLimit = Math.min(Math.max(Number(limit) || 50, 1), 200)
   const normalizedPage = Math.max(Number(page) || 1, 1)
-  const hasQuery = !!(queryText || '').trim()
-  const search = `%${(queryText || '').trim()}%`
-  const whereClause = hasQuery ? 'WHERE c.label LIKE ? OR c.src LIKE ? OR u.email LIKE ? OR u.nickname LIKE ?' : ''
-  const params = hasQuery ? [search, search, search, search] : []
+  const searchText = (queryText || '').trim()
+  const hasQuery = !!searchText
+  const search = `%${searchText}%`
 
-  const rows = await query(
-    `
-      SELECT
-        c.id,
-        c.owner_id,
-        c.src,
-        c.label,
-        c.created_at,
-        u.nickname,
-        u.email
-      FROM custom_items c
-      INNER JOIN users u ON u.id = c.owner_id
-      ${whereClause}
-      ORDER BY c.created_at DESC
-    `,
-    params
-  )
+  const [customRows, gameItemRows, usageMeta] = await Promise.all([
+    query(
+      `
+        SELECT
+          c.id,
+          c.owner_id,
+          c.src,
+          c.label,
+          c.created_at,
+          u.nickname,
+          u.email
+        FROM custom_items c
+        INNER JOIN users u ON u.id = c.owner_id
+        ${hasQuery ? 'WHERE c.label LIKE ? OR c.src LIKE ? OR u.email LIKE ? OR u.nickname LIKE ?' : ''}
+        ORDER BY c.created_at DESC
+      `,
+      hasQuery ? [search, search, search, search] : []
+    ),
+    query(
+      `
+        SELECT
+          gi.id,
+          gi.game_id,
+          gi.src,
+          gi.label,
+          gi.created_at,
+          g.name AS game_name
+        FROM game_items gi
+        INNER JOIN games g ON g.id = gi.game_id
+        ${hasQuery ? 'WHERE gi.label LIKE ? OR gi.src LIKE ? OR gi.game_id LIKE ? OR g.name LIKE ?' : ''}
+        ORDER BY gi.created_at DESC
+      `,
+      hasQuery ? [search, search, search, search] : []
+    ),
+    getCustomItemUsageMeta(),
+  ])
 
-  const { usageMap, linkedGamesMap } = await getCustomItemUsageMeta()
-  const allItems = rows
-    .map((row) => ({
+  const templateLinkedBySrc = new Map()
+  gameItemRows.forEach((row) => {
+    if (!row?.src) return
+    if (!templateLinkedBySrc.has(row.src)) templateLinkedBySrc.set(row.src, new Map())
+    templateLinkedBySrc.get(row.src).set(row.game_id, {
+      id: row.game_id,
+      name: row.game_name || row.game_id,
+    })
+  })
+
+  const customItems = customRows.map((row) => {
+    const linkedGames = Array.from((templateLinkedBySrc.get(row.src) || new Map()).values())
+    return {
       id: row.id,
       ownerId: row.owner_id,
       src: row.src,
@@ -1241,10 +1274,37 @@ async function listCustomItems({ queryText = '', page = 1, limit = 50, orphanOnl
       createdAt: Number(row.created_at),
       ownerName: row.nickname || row.email,
       ownerEmail: row.email,
-      usageCount: usageMap.get(row.id) || 0,
-      linkedGames: linkedGamesMap.get(row.id) || [],
-    }))
-    .filter((item) => (orphanOnly ? item.usageCount === 0 : true))
+      usageCount: usageMeta.usageMap.get(row.id) || 0,
+      linkedGames,
+      sourceType: 'user',
+      sourceLabel: '사용자 업로드',
+      canDelete: true,
+    }
+  })
+
+  const templateItems = gameItemRows.map((row) => ({
+    id: row.id,
+    ownerId: '',
+    src: row.src,
+    label: row.label,
+    createdAt: Number(row.created_at),
+    ownerName: row.game_name || row.game_id,
+    ownerEmail: '',
+    usageCount: (templateLinkedBySrc.get(row.src) || new Map()).size,
+    linkedGames: Array.from((templateLinkedBySrc.get(row.src) || new Map()).values()),
+    sourceType: 'template',
+    sourceLabel: '관리자 템플릿',
+    canDelete: false,
+    sourceGameId: row.game_id,
+    sourceGameName: row.game_name || row.game_id,
+  }))
+
+  const allItems = [...customItems, ...templateItems]
+    .filter((item) => {
+      if (!orphanOnly) return true
+      return item.sourceType === 'user' && item.usageCount === 0 && item.linkedGames.length === 0
+    })
+    .sort((a, b) => Number(b.createdAt || 0) - Number(a.createdAt || 0))
 
   const total = allItems.length
   const offset = (normalizedPage - 1) * normalizedLimit
@@ -1935,6 +1995,7 @@ module.exports = {
   listGames,
   findGameById,
   listGameItems,
+  findGameItemById,
   getGameDetail,
   createGame,
   updateGameThumbnail,

backend/src/lib/image-storage.js

@@ -75,7 +75,7 @@ async function optimizeAndPersist({ file, width, height, fit, quality }) {
     }
   }
 
-  const filename = String(Date.now()) + '-' + nanoid() + '.webp'
+  const filename = nanoid() + '.webp'
   const absoluteDir = path.join(UPLOAD_ROOT, OPTIMIZED_DIR)
   const absolutePath = path.join(absoluteDir, filename)
   const src = '/uploads/' + OPTIMIZED_DIR + '/' + filename

backend/src/routes/admin.js

@@ -8,6 +8,7 @@ const { nanoid } = require('nanoid')
 const {
   findUserById,
   findGameById,
+  findGameItemById,
   createGame,
   listGames,
   updateGameThumbnail,
@@ -322,12 +323,12 @@ async function removeCustomItemFiles(items) {
   )
 }
 
-async function promoteCustomItemToGameItem({ customItem, gameId }) {
+async function promoteLibraryItemToGameItem({ item, gameId }) {
   return createGameItem({
     id: nanoid(),
     gameId,
-    src: customItem.src || '',
-    label: customItem.label,
+    src: item.src || '',
+    label: item.label,
   })
 }
 
@@ -428,6 +429,8 @@ router.delete('/custom-items/:itemId', requireAdmin, async (req, res) => {
   const result = await listCustomItems({ page: 1, limit: 200, orphanOnly: false })
   const target = result.items.find((item) => item.id === req.params.itemId)
   if (!target) return res.status(404).json({ error: 'not_found' })
+  if (!target.canDelete) return res.status(409).json({ error: 'item_locked' })
+  if (target.linkedGames.length > 0) return res.status(409).json({ error: 'item_linked' })
   if (target.usageCount > 0) return res.status(409).json({ error: 'item_in_use' })
 
   const items = await findCustomItemsByIds([target.id])
@@ -447,9 +450,11 @@ router.post('/custom-items/:itemId/promote', requireAdmin, async (req, res) => {
   if (!game) return res.status(404).json({ error: 'game_not_found' })
 
   const customItem = await findCustomItemById(req.params.itemId)
-  if (!customItem) return res.status(404).json({ error: 'not_found' })
+  const gameItem = customItem ? null : await findGameItemById(req.params.itemId)
+  const sourceItem = customItem || gameItem
+  if (!sourceItem) return res.status(404).json({ error: 'not_found' })
 
-  const item = await promoteCustomItemToGameItem({ customItem, gameId: game.id })
+  const item = await promoteLibraryItemToGameItem({ item: sourceItem, gameId: game.id })
   res.json({ item })
 })